{"push_id":559468042,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"d029bd1f01a67d5cad62fe730444234370f78e39","before":"2805244a6d908d1f4a81c76baddd23c7966550e2","commits":[{"sha":"57bcf0a9f40d524fd30860253ba3e8c4faa963a0","author":{"email":"64b2b6d12bfe4baae7dad3d018f8cbf6b0e7a044@nicofuma.fr","name":"Tristan Darricau"},"message":"Integration tests","distinct":true,"url":"https://api.github.com/repos/ptitlazy/backend/commits/57bcf0a9f40d524fd30860253ba3e8c4faa963a0"},{"sha":"fa67d9c9a41a569e539d17d2cf6971cbebb53912","author":{"email":"64b2b6d12bfe4baae7dad3d018f8cbf6b0e7a044@nicofuma.fr","name":"Tristan Darricau"},"message":"Merge branch 'master' of github.com:dac-ensimag/backend\n\n* 'master' of github.com:dac-ensimag/backend:\n  leger refactor\n  leger refactor\n  Ajout de la page pour creer un article\n  [Frontend] Taille fixe pour les images du catalogue\n  Essai Ajout commande\n  [Frontend] intégration template panier\n  [Frontend] Lien vers le panier dans le top menu sur toutes les pages\n  makeadmin.sh : script permettant de passer un user en admin\n  historique des commandes\n  scripts de mise à jour de base update : images\n  Fixed removing articles\n  Ajout lien vers le catalogue\n\nConflicts:\n\tensimag-dac/ensimag_dac/ensimag_dac-ejb/src/main/java/fr/ensimag/entity/Article.java\n\tensimag-dac/ensimag_dac/ensimag_dac-ejb/src/main/java/fr/ensimag/logic/ArticleService.java\n\tensimag-dac/ensimag_dac/ensimag_dac-ejb/src/main/java/fr/ensimag/logic/ArticleServiceLocal.java","distinct":true,"url":"https://api.github.com/repos/ptitlazy/backend/commits/fa67d9c9a41a569e539d17d2cf6971cbebb53912"},{"sha":"d029bd1f01a67d5cad62fe730444234370f78e39","author":{"email":"64b2b6d12bfe4baae7dad3d018f8cbf6b0e7a044@nicofuma.fr","name":"Tristan Darricau"},"message":"Fix CommandeService","distinct":true,"url":"https://api.github.com/repos/ptitlazy/backend/commits/d029bd1f01a67d5cad62fe730444234370f78e39"}]}