{"push_id":928787740,"size":7,"distinct_size":7,"ref":"refs/heads/master","head":"d7d25a2972958f7554ee461d8232f46464ddb89b","before":"1ebe87c699192632a96c34d7a3054bc07d680f43","commits":[{"sha":"208b886ccaa28314400f3ddef2af3cc980e6fdaa","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Merge branch 'master' of D:\\programmes\\IDEA\\ProjetTutS3B2\\ProjetTutS3B2 with conflicts.","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/208b886ccaa28314400f3ddef2af3cc980e6fdaa"},{"sha":"e0af1e8194d42c2295a6c5b4b50a99d38875b790","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/e0af1e8194d42c2295a6c5b4b50a99d38875b790"},{"sha":"944f4af37ab1c33773ff93fbe6a9d173b219fcf1","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Utilisation des listes dans le modèle","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/944f4af37ab1c33773ff93fbe6a9d173b219fcf1"},{"sha":"472ef93b6b8458d9347b9b18b1002558b8a6a28d","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tIDEA/src/game/Unite.java","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/472ef93b6b8458d9347b9b18b1002558b8a6a28d"},{"sha":"08e4969194477a0b48573141a7c6b196e10c45b2","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/08e4969194477a0b48573141a7c6b196e10c45b2"},{"sha":"023b6edaf36e9cb4a1caa62f244dbe6871423523","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tIDEA/src/game/RenderPanel.java","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/023b6edaf36e9cb4a1caa62f244dbe6871423523"},{"sha":"d7d25a2972958f7554ee461d8232f46464ddb89b","author":{"email":"b8a4626922bb9b9ffabe7053e0f532112a0ebadf@hotmail.fr","name":"Kieran-Molina"},"message":"Update model","distinct":true,"url":"https://api.github.com/repos/Kieran-Molina/ProjetTutS3B2/commits/d7d25a2972958f7554ee461d8232f46464ddb89b"}]}