GitHub PushEvent at 2014-04-02 07:28:50
Repository: Backend-MeetingRoom
Actor: wim82
Payload: {"shas":[["d1daacc5b5f095ce20d8eb30da629c607194d31d","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tMeetingRoom/src/main/java/be/kawi/meetingroom/controller/ReservationController.java","wim82",true],["c5193f6746666511dcd0cf23f579438f3bd234df","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Revert \"spaties toegevoegd\"\n\nThis reverts commit fc234b64ef268ba2a8a9a5983532aa09c306d719.\n\nConflicts:\n\tMeetingRoom/src/main/java/be/kawi/meetingroom/json/JsonDateSerializer.java","wim82",true],["cc7833f99930755ce06bec1f403ee64f4ed83d23","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Merge remote-tracking branch 'origin/master'","wim82",true],["a292727870cf0256f540c059c1fc76942d754bd6","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Merge branch 'master' of https://github.com/wim82/Backend-MeetingRoom.git","wim82",true],["01a377c1612200b8a27e5fd8f2134356f5935cdc","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Weird Update van katrien","wim82",true],["381d7e8f6f82eb7889e24e0ad7ab0c2bc1c2d5c1","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Merge remote-tracking branch 'origin/master'","wim82",true],["93269dcf8d1cb41f014a209ca212cccae355bcd2","29758d67717b2cc23559e47020e9f7a872390867@gmail.com","Added empty User() constructor","wim82",true]],"size":7,"ref":"refs/heads/master","head":"93269dcf8d1cb41f014a209ca212cccae355bcd2"}