{"shas":[["670a021ff77cdcbd3a69b7a986144e80eec228b4","bb26cb790bef449ce915988c159060fc8538347c@unine.ch","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tsrc/ResourceBook/ManageResources/admin.pyc\n\tsrc/ResourceBook/ManageResources/urls.pyc\n\tsrc/ResourceBook/ManageResources/views.pyc","stephane"]],"repo":"charnasj/ResourceBook","actor":"donatus","ref":"refs/heads/master","size":1,"head":"670a021ff77cdcbd3a69b7a986144e80eec228b4","actor_gravatar":"82f41f428eabe613b50fb2ad7ecdfa5d","push_id":31933873}