{"push_id":699573132,"size":1,"distinct_size":1,"ref":"refs/heads/multiplayer-event","head":"11b1d4cc2f8ec974a12c080a7cc148d5f97d5734","before":"bc05a383876a6b4aa956e389a715a990dfb7572c","commits":[{"sha":"11b1d4cc2f8ec974a12c080a7cc148d5f97d5734","author":{"email":"c636c5e6f84ddc7148df5bde9217673f7940ff2d@student.tudelft.nl","name":"Jurgen van Schagen"},"message":"Merge branches 'dev' and 'multiplayer-event' of https://github.com/foresterre/ContextProject into multiplayer-event\n\nConflicts:\n\tandroid/assets/local.sqlite\n\tbuild.gradle\n\tcore/src/cg/group4/view/util/rewards/CollectibleDrawer.java\n\tcore/test/cg/group4/view/util/rewards/CollectibleDrawerTest.java\n\tcore/test/testAssets/TestCollectibleDrawer1.png\n\tcore/test/testAssets/TestCollectibleDrawer2.png","distinct":true,"url":"https://api.github.com/repos/foresterre/ContextProject/commits/11b1d4cc2f8ec974a12c080a7cc148d5f97d5734"}]}