{"push_id":852433994,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"308894bf7b7506ae587989f4530c0e7725ade7c0","before":"0d3b879554335ba34bf7d71b7c80bcdde913737f","commits":[{"sha":"06898a38d9bb42956b5e333bf4f08409dd8fa24f","author":{"email":"543a7428f2f510f0419f861373923ca966ffdf60@gmail.com","name":"Luxin Zhang"},"message":"rename","distinct":true,"url":"https://api.github.com/repos/marrvolo/PokerGameIHMMain/commits/06898a38d9bb42956b5e333bf4f08409dd8fa24f"},{"sha":"308894bf7b7506ae587989f4530c0e7725ade7c0","author":{"email":"543a7428f2f510f0419f861373923ca966ffdf60@gmail.com","name":"Luxin Zhang"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tbuild/built-jar.properties\n\tsrc/ihmmain/controller/model/User.java\n\tsrc/ihmmain/controller/view/ViewProfil.fxml\n\tsrc/utc/pokeronline/ihm/main/MainApp.java\n\tsrc/utc/pokeronline/ihm/main/model/Game.java\n\tsrc/utc/pokeronline/ihm/main/model/Table.java\n\tsrc/utc/pokeronline/ihm/main/model/User.java\n\tsrc/utc/pokeronline/ihm/main/util/CopyFile.java\n\tsrc/utc/pokeronline/ihm/main/view/ConfirmNewUserController.java\n\tsrc/utc/pokeronline/ihm/main/view/CreateTable.fxml\n\tsrc/utc/pokeronline/ihm/main/view/CreateTableController.java\n\tsrc/utc/pokeronline/ihm/main/view/JoinPage.fxml\n\tsrc/utc/pokeronline/ihm/main/view/JoinPageController.java\n\tsrc/utc/pokeronline/ihm/main/view/LoginPage.fxml\n\tsrc/utc/pokeronline/ihm/main/view/LoginPageController.java\n\tsrc/utc/pokeronline/ihm/main/view/MainPage.fxml\n\tsrc/utc/pokeronline/ihm/main/view/MainPageController.java\n\tsrc/utc/pokeronline/ihm/main/view/MonProfilPage.fxml\n\tsrc/utc/pokeronline/ihm/main/view/MonProfilPageController.java\n\tsrc/utc/pokeronline/ihm/main/view/StartGameController.java\n\tsrc/utc/pokeronline/ihm/main/view/TableCreatedController.java\n\tsrc/utc/pokeronline/ihm/main/view/ViewProfil.fxml\n\tsrc/utc/pokeronline/ihm/main/view/ViewProfile.fxml\n\tsrc/utc/pokeronline/ihm/main/view/ViewProfileController.java","distinct":true,"url":"https://api.github.com/repos/marrvolo/PokerGameIHMMain/commits/308894bf7b7506ae587989f4530c0e7725ade7c0"}]}