{"push_id":674444640,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"f25dce6d3a096b98b462dcd3c7c8920b8650ad04","before":"6ce5b08ecccce5270fbbf557b2c6ad488786987c","commits":[{"sha":"56155d9149c1d94d9ab8258a8ad84456aa37cd06","author":{"email":"d01a8c29ad86bce27fab0b6f6c91ec1d692daf24@heig-vd.ch","name":"jurporan"},"message":"Ajouter la gestion des salles secrètes à la création de salle (pas encore testé)","distinct":true,"url":"https://api.github.com/repos/edri/ProjetChat2015/commits/56155d9149c1d94d9ab8258a8ad84456aa37cd06"},{"sha":"f25dce6d3a096b98b462dcd3c7c8920b8650ad04","author":{"email":"d01a8c29ad86bce27fab0b6f6c91ec1d692daf24@heig-vd.ch","name":"jurporan"},"message":"Merge branch 'master' of https://github.com/edri/ProjetChat2015\n\nConflicts:\n\tModeleChator/modelChator.cpp\n\tModeleChator/modelChator.h\n\tSalle/Room/controllerRoom.cpp\n\tSalle/Room/controllerRoom.h\n\tServeur/Interpretor/interpretor.cpp\n\tServeur/Interpretor/interpretor.h\n\tServeur/controllerInput/clientControllerInput.cpp\n\tServeur/controllerInput/clientControllerInput.h\n\tServeur/controllerInput/controllerInput.h\n\tServeur/controllerOutput/controllerOutput.cpp\n\tServeur/controllerOutput/controllerOutput.h","distinct":true,"url":"https://api.github.com/repos/edri/ProjetChat2015/commits/f25dce6d3a096b98b462dcd3c7c8920b8650ad04"}]}