{"push_id":715460998,"size":20,"distinct_size":1,"ref":"refs/heads/3rdMaster","head":"aa8573dfa97cfc1b075cdac4acd8b8ab8c2b98e2","before":"c88bff936d8399bd29c6c4aabf1572a5368b7a4c","commits":[{"sha":"534c13762a0920352b4d42c9394c6d5abae33dc4","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Merge remote-tracking branch 'origin/Timo' into Joey","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/534c13762a0920352b4d42c9394c6d5abae33dc4"},{"sha":"2845fc82c11ef6576f4409ba9916f4564fb137c8","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Merge branch 'master' into Joey","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/2845fc82c11ef6576f4409ba9916f4564fb137c8"},{"sha":"a9af5e6031140b162823c582f433269b1144db09","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Merge branch 'master' of https://github.com/ThomasBurkart/ITProjektSS15.git","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/a9af5e6031140b162823c582f433269b1144db09"},{"sha":"a9e165bb77e0a6213b984cf6c44dea98673ff83f","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Merge branch 'master' of https://github.com/ThomasBurkart/ITProjektSS15.git","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/a9e165bb77e0a6213b984cf6c44dea98673ff83f"},{"sha":"09cc56c7fb67efa06929852547cf3bbdf4dcccac","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"size in partlist","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/09cc56c7fb67efa06929852547cf3bbdf4dcccac"},{"sha":"9313c744fea39bceb480c805456ad8d04359d3ba","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"test grid","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/9313c744fea39bceb480c805456ad8d04359d3ba"},{"sha":"fa2fc3e13c0a78295b80a2aa56942d9cff2acf5a","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"reportgen","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/fa2fc3e13c0a78295b80a2aa56942d9cff2acf5a"},{"sha":"472f20c6db2f5922f6dd0a10717d53fab8d22475","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Merge branch 'master' of\nhttps://github.com/ThomasBurkart/ITProjektSS15.git\n\nConflicts:\n\tsrc/de/hdm/groupfive/itproject/shared/bo/Partlist.java","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/472f20c6db2f5922f6dd0a10717d53fab8d22475"},{"sha":"e7a59dd5e7da908c70c9beb1cee6a7c0979839b7","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Konflikt behoben","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/e7a59dd5e7da908c70c9beb1cee6a7c0979839b7"},{"sha":"ab5e2cc10756748496d05fb9a5ea69bc32663d60","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"unklarer Konflikt mit ElementForm","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/ab5e2cc10756748496d05fb9a5ea69bc32663d60"},{"sha":"853994e7034bc266186fd7fa371f94540e462d7e","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Merge branch 'Joel'\n\nConflicts:\n\t!Protokoll\n\tsrc/de/hdm/groupfive/itproject/client/SearchPanel.java\n\tsrc/de/hdm/groupfive/itproject/client/SearchResult.java\n\tsrc/de/hdm/groupfive/itproject/server/AdministrationCommonImpl.java\n\tsrc/de/hdm/groupfive/itproject/server/db/ElementMapper.java\n\tsrc/de/hdm/groupfive/itproject/server/db/ModuleMapper.java\n\tsrc/de/hdm/groupfive/itproject/server/db/PartlistMapper.java\n\tsrc/de/hdm/groupfive/itproject/shared/AdministrationCommon.java\n\tsrc/de/hdm/groupfive/itproject/shared/AdministrationCommonAsync.java\n\tsrc/de/hdm/groupfive/itproject/shared/bo/Module.java\n\tsrc/de/hdm/groupfive/itproject/shared/bo/Product.java\n\tsrc/de/hdm/groupfive/itproject/shared/bo/User.java","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/853994e7034bc266186fd7fa371f94540e462d7e"},{"sha":"7b9887bb1e95abc6bbac65e23280647e83e394eb","author":{"email":"7f627957b018fdab26e9c6c678a0852725eeeca4@gmail.com","name":"Joel.Siffermann"},"message":"Branch auf den neusten Stand bringen","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/7b9887bb1e95abc6bbac65e23280647e83e394eb"},{"sha":"5742a27690472adf5a69a8a75fc5eefb29fc49a7","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"kommentare","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/5742a27690472adf5a69a8a75fc5eefb29fc49a7"},{"sha":"17f116fa0181c1075af7d6e01fb551c3b71e0e49","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"klassendiagramm files noch commiten","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/17f116fa0181c1075af7d6e01fb551c3b71e0e49"},{"sha":"ede7286561106b2025e74d572f053ace68fb21f7","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"Revert \"kommentare\"\n\nThis reverts commit 5742a27690472adf5a69a8a75fc5eefb29fc49a7.","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/ede7286561106b2025e74d572f053ace68fb21f7"},{"sha":"c1b121ccf789757e0eec6ab025a7ce3cd560a249","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"Merge branch 'master' of\nhttps://github.com/ThomasBurkart/ITProjektSS15.git\n\nConflicts:\n\tClassDiagram.notation\n\tClassDiagram.uml","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/c1b121ccf789757e0eec6ab025a7ce3cd560a249"},{"sha":"8a1c1d2822460bffea660da577d53fa51ca1adc5","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"Merge remote-tracking branch 'origin/Thomas'\n\nConflicts:\n\tsrc/de/hdm/groupfive/itproject/client/AssignPanel.java\n\tsrc/de/hdm/groupfive/itproject/client/CreateElement.java\n\tsrc/de/hdm/groupfive/itproject/client/History.java","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/8a1c1d2822460bffea660da577d53fa51ca1adc5"},{"sha":"8569a2addc801ecdb557747c1f0b1a04c7e83828","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"Merge remote-tracking branch 'origin/Thomas'\n\nConflicts:\n\tsrc/de/hdm/groupfive/itproject/client/History.java","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/8569a2addc801ecdb557747c1f0b1a04c7e83828"},{"sha":"a5d0f32230e935fa48f0216f6601ec65e8185773","author":{"email":"e11ecdd9b587a5296cde825c3bca92994b8e806a@gmail.com","name":"TimoFesseler"},"message":"Hoffentlich Krankheit beseitigt","distinct":false,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/a5d0f32230e935fa48f0216f6601ec65e8185773"},{"sha":"aa8573dfa97cfc1b075cdac4acd8b8ab8c2b98e2","author":{"email":"e7f2a03b9c0324d49cf65afb9f1e018a7ef1c35d@hdm-stuttgart.de","name":"Thomas Burkart"},"message":"Merge branch 'master' into 3rdMaster\n\nConflicts:\n\tsrc/de/hdm/groupfive/itproject/client/AssignPanel.java\n\tsrc/de/hdm/groupfive/itproject/client/ClientsideSettings.java\n\tsrc/de/hdm/groupfive/itproject/client/History.java","distinct":true,"url":"https://api.github.com/repos/ThomasBurkart/ITProjektSS15/commits/aa8573dfa97cfc1b075cdac4acd8b8ab8c2b98e2"}]}