{"push_id":949214452,"size":13,"distinct_size":1,"ref":"refs/heads/ClientMaken","head":"994ba33f50a4cea8a9ad1e83d5e8eafa52c3f9e2","before":"2b0928d0f2f33ac7899e9ede7759bc165a0eb424","commits":[{"sha":"bd1be61ec9fb90aa65c35a9d0415497de5eb6123","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"clientExceptions","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/bd1be61ec9fb90aa65c35a9d0415497de5eb6123"},{"sha":"c10b3112a3882fa6782d0b0b27226bf6382cef66","author":{"email":"24e549680bf4b6a83dd77512618092359d993960@users.noreply.github.com","name":"StephanMB"},"message":"Update README.md","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/c10b3112a3882fa6782d0b0b27226bf6382cef66"},{"sha":"89bf5ffa19bc616fadb4421080037f1f78984a1f","author":{"email":"24e549680bf4b6a83dd77512618092359d993960@users.noreply.github.com","name":"StephanMB"},"message":"Update README.md","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/89bf5ffa19bc616fadb4421080037f1f78984a1f"},{"sha":"83d032574cb8939206c15265c8f2e06c4c0c6876","author":{"email":"24e549680bf4b6a83dd77512618092359d993960@users.noreply.github.com","name":"StephanMB"},"message":"Update README.md","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/83d032574cb8939206c15265c8f2e06c4c0c6876"},{"sha":"ca38154c7ccc84e8a18b1144fad8667a22e65883","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"Added Diagram integration","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/ca38154c7ccc84e8a18b1144fad8667a22e65883"},{"sha":"cdaf532c4073b66a6ad591ebc51a32b5f8d9ee5d","author":{"email":"d663a888d672ce5b26e0f885a29610a57dd49826@gmail.com","name":"Jasper Gerth"},"message":"Merge remote-tracking branch 'origin/ClientMaken'\n\nConflicts:\n\tSS-Projekt/src/client/Client.java\n\tSS-Projekt/src/clientTests/ClientBasicTest.java\n\tSS-Projekt/src/server/ClientConnection.java\n\tSS-Projekt/src/server/GameDataBase.java","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/cdaf532c4073b66a6ad591ebc51a32b5f8d9ee5d"},{"sha":"68d4288ee393742fe678cad705876dd482b55de3","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"Merge branch 'master' into ClientStephan","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/68d4288ee393742fe678cad705876dd482b55de3"},{"sha":"9a3eb18829b5d1b1bb46c1f5e02bb1a41084ef73","author":{"email":"d663a888d672ce5b26e0f885a29610a57dd49826@gmail.com","name":"Jasper Gerth"},"message":"Merge remote-tracking branch 'origin/ClientMaken'","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/9a3eb18829b5d1b1bb46c1f5e02bb1a41084ef73"},{"sha":"acf519be2185cde822446e810e6f88455f64b02c","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"uit stub","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/acf519be2185cde822446e810e6f88455f64b02c"},{"sha":"4ac247568b5957ae26ba8e9be62c9f1bfa1c3584","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"fetch","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/4ac247568b5957ae26ba8e9be62c9f1bfa1c3584"},{"sha":"ca5851a992c1f11f5f8b7e6111b5477aa46f59b7","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"mergeconflict","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/ca5851a992c1f11f5f8b7e6111b5477aa46f59b7"},{"sha":"a4ef16a395c87a4d484b8dcefb267beb9aa9b8a7","author":{"email":"1066e47f720a1f3c9ab61c01dcca2312e35d2edc@gmail.com","name":"StephanMB"},"message":"added TUI","distinct":false,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/a4ef16a395c87a4d484b8dcefb267beb9aa9b8a7"},{"sha":"994ba33f50a4cea8a9ad1e83d5e8eafa52c3f9e2","author":{"email":"d663a888d672ce5b26e0f885a29610a57dd49826@gmail.com","name":"Jasper Gerth"},"message":"Merge remote-tracking branch 'origin/master' into ClientMaken\n\nConflicts:\n\tSS-Projekt/src/client/Client.java\n\tSS-Projekt/src/client/ServerConnection.java\n\tSS-Projekt/src/clientTests/ClientBasicTest.java\n\tSS-Projekt/src/server/ClientConnection.java","distinct":true,"url":"https://api.github.com/repos/StephanMB/SS-Projekt/commits/994ba33f50a4cea8a9ad1e83d5e8eafa52c3f9e2"}]}