{"push_id":596424066,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"27e6516a878b7285f516cf90f4882ad9f620264e","before":"e5f955b428ff014e3bfb62e5f0310e3045cfcebb","commits":[{"sha":"9c562336a6bcbec7d4c7119bab3ed5ac45b91698","author":{"email":"fadeddca55d15f51c2fd7105c039be581f392ae8@hotmail.com","name":"robjochem"},"message":"addActivityView\n\nChanged app.js mainController to receive addActivityContr\naddActivity working and all related stuff","distinct":true,"url":"https://api.github.com/repos/onlinecco/DH2641-planner/commits/9c562336a6bcbec7d4c7119bab3ed5ac45b91698"},{"sha":"27e6516a878b7285f516cf90f4882ad9f620264e","author":{"email":"fadeddca55d15f51c2fd7105c039be581f392ae8@hotmail.com","name":"robjochem"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tjs/controller/addActivityController.js\n\tjs/controller/mainController.js","distinct":true,"url":"https://api.github.com/repos/onlinecco/DH2641-planner/commits/27e6516a878b7285f516cf90f4882ad9f620264e"}]}