{"push_id":658547804,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"39e517f3dab934c27f3f9d69b3571e77d6940bab","before":"7477b6419fba6e9c5cc13cbcf493c0ac6d377f87","commits":[{"sha":"0fb81baf8487aafab343f0c0806501d9efaa88ca","author":{"email":"8fe18c79cfa2da154f589b90350644c766e2b11f@iut-valence.fr","name":"joris"},"message":"english translation (jajaja)\nlots of minor upgrades","distinct":true,"url":"https://api.github.com/repos/nicolaslogut/ageOfAntHill/commits/0fb81baf8487aafab343f0c0806501d9efaa88ca"},{"sha":"39e517f3dab934c27f3f9d69b3571e77d6940bab","author":{"email":"8fe18c79cfa2da154f589b90350644c766e2b11f@iut-valence.fr","name":"joris"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tprojet/src/javaproject_ageOfAntHill/Constructible.java\n\tprojet/src/javaproject_ageOfAntHill/Gardien.java\n\tprojet/src/javaproject_ageOfAntHill/Guerrier.java\n\tprojet/src/javaproject_ageOfAntHill/Interface.java\n\tprojet/src/javaproject_ageOfAntHill/Lezard.java\n\tprojet/src/javaproject_ageOfAntHill/Map.java\n\tprojet/src/javaproject_ageOfAntHill/Ouvrier.java\n\tprojet/src/javaproject_ageOfAntHill/Partie.java\n\tprojet/src/javaproject_ageOfAntHill/Position.java\n\tprojet/src/javaproject_ageOfAntHill/Reine.java\n\tprojet/src/javaproject_ageOfAntHill/Scarabée.java\n\tprojet/src/javaproject_ageOfAntHill/Scout.java\n\tprojet/src/javaproject_ageOfAntHill/Tireur.java\n\tprojet/src/javaproject_ageOfAntHill/Unite.java","distinct":true,"url":"https://api.github.com/repos/nicolaslogut/ageOfAntHill/commits/39e517f3dab934c27f3f9d69b3571e77d6940bab"}]}