{"ref":"refs/heads/master","commits":[{"author":{"email":"74c403ba6e4149f5c90ee1d88acf42a9038d4433@gmail.com","name":"Pieter Massoels"},"sha":"9ffa53e145be2576b090474c9742c4dcd832c8dc","message":"Merge conflict fix","url":"https://api.github.com/repos/trophiesteam/trophy/commits/9ffa53e145be2576b090474c9742c4dcd832c8dc"},{"author":{"email":"74c403ba6e4149f5c90ee1d88acf42a9038d4433@gmail.com","name":"Pieter Massoels"},"sha":"cddce9c1954bcb62b2ecc65432304bae51a79448","message":"Merge conflict fix 2","url":"https://api.github.com/repos/trophiesteam/trophy/commits/cddce9c1954bcb62b2ecc65432304bae51a79448"},{"author":{"email":"74c403ba6e4149f5c90ee1d88acf42a9038d4433@gmail.com","name":"Pieter Massoels"},"sha":"4e3021d059b728ca11e5a4c59e785b26e1acf5c7","message":"Merge branch 'master' of github.com:trophiesteam/trophy\n\nConflicts:\n\tflex/src/mate/views/updateprofile.mxml","url":"https://api.github.com/repos/trophiesteam/trophy/commits/4e3021d059b728ca11e5a4c59e785b26e1acf5c7"}],"head":"4e3021d059b728ca11e5a4c59e785b26e1acf5c7","push_id":53115261,"size":3}