{"shas":[["a5d6446df9d0ef7131493aa93af030a39827952e","9ce5770b3bb4b2a1d59be2d97e34379cd192299f@newicon.net","laptop changes","steve"],["a3583a4ddd727e6a59726188bf304d2043952443","9ce5770b3bb4b2a1d59be2d97e34379cd192299f@newicon.net","Merge branch 'master' of git@github.com:newicon/Nii.git\n\nConflicts:\n\tprotected/app/config/main.php\n\tprotected/app/views/layouts/main.php\n\tprotected/modules/crm/components/CrmCard.php\n\tprotected/modules/crm/components/CrmImage.php\n\tprotected/modules/crm/models/CrmContact.php\n\tprotected/modules/user/components/NLoginInfo.php\n\tprotected/modules/user/components/NWebUser.php\n\tprotected/modules/user/components/views/login-info.php\n\tprotected/modules/user/controllers/RegistrationController.php\n\tprotected/modules/user/models/User.php","steve"],["1df4bdb9c12a75a7690a3b8164b14ed8ce1c9ff1","9ce5770b3bb4b2a1d59be2d97e34379cd192299f@newicon.net","email client: load email messages based on scroll position","steve"]],"repo":"newicon/Nii","actor":"steve-newicon","ref":"refs/heads/master","size":3,"head":"1df4bdb9c12a75a7690a3b8164b14ed8ce1c9ff1","actor_gravatar":"84a6778f82775b54a5f7ba38c916f68f","push_id":26098724}