{"push_id":890269898,"size":8,"distinct_size":8,"ref":"refs/heads/master","head":"9ad71fe15f1c0f870b6d4eebea7676f0177e3277","before":"e1f25809713d5bf9e207f3845970b9bfe00fe69d","commits":[{"sha":"f5c94dcd363624fd896b48733968e53c941827b1","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Merge origin/master\n\nConflicts:\n\tScrabble_Server/src/scrabble_server/Scrabble_Server.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/f5c94dcd363624fd896b48733968e53c941827b1"},{"sha":"69d03c9458c0e9a5daede547a05ec4f754d0b4c1","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Merge origin/master\n\nConflicts:\n\tScrabble_Server/src/scrabble_server/Scrabble_Server.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/69d03c9458c0e9a5daede547a05ec4f754d0b4c1"},{"sha":"171f4291f8adbbc09f3bf5f4e7456467930c25ba","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Merge origin/master\n\nConflicts:\n\tScrabble_Server/src/scrabble_server/Scrabble_Server.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/171f4291f8adbbc09f3bf5f4e7456467930c25ba"},{"sha":"efa65f5ed6125eb1c995e8448181e4f94bd59eb7","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Revert \"Merge origin/master\"\n\nThis reverts commit 171f4291f8adbbc09f3bf5f4e7456467930c25ba.","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/efa65f5ed6125eb1c995e8448181e4f94bd59eb7"},{"sha":"c08fe4a9108e5b27039bad94febd0b672643f4b0","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Merge origin/master\n\nConflicts:\n\tScrabble_Server/src/scrabble_server/Scrabble_Server.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/c08fe4a9108e5b27039bad94febd0b672643f4b0"},{"sha":"e7f41af61b11ea11aebf571d0f0ae5f12bc9098d","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Merge origin/master\n\nConflicts:\n\tScrabble_Client/src/GUI/MainPage.form\n\tScrabble_Client/src/GUI/MainPage.java\n\tScrabble_Client/src/scrabble_client/Client.java\n\tScrabble_Client/src/scrabble_client/ClientService.java\n\tScrabble_Client/src/scrabble_client/MD5.java\n\tScrabble_Client/src/scrabble_client/logControl.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/e7f41af61b11ea11aebf571d0f0ae5f12bc9098d"},{"sha":"b171d77dc63cd41e5231bf5ca4e68d2f26eb9a36","author":{"email":"236733f3178cbad469c0cb9c9abf6e0dea92c0aa@Hal9000","name":"Flávio"},"message":"Merge origin/master\n\nConflicts:\n\tScrabble_Client/src/GUI/MainPage.form\n\tScrabble_Client/src/GUI/MainPage.java\n\tScrabble_Client/src/scrabble_client/Client.java\n\tScrabble_Client/src/scrabble_client/ClientService.java\n\tScrabble_Client/src/scrabble_client/MD5.java\n\tScrabble_Client/src/scrabble_client/logControl.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/b171d77dc63cd41e5231bf5ca4e68d2f26eb9a36"},{"sha":"9ad71fe15f1c0f870b6d4eebea7676f0177e3277","author":{"email":"56c7c036c7df36c54c1a4395521e9335b1ff35fb@fe.up.pt","name":"Flávio Dias"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tScrabble_Client/src/scrabble_client/MD5.java","distinct":true,"url":"https://api.github.com/repos/f1avio/LPRO2015/commits/9ad71fe15f1c0f870b6d4eebea7676f0177e3277"}]}