{"head":"0a2cf330e7e351aba53e7383f3378df9c96d4b03","size":5,"push_id":47147219,"ref":"refs/heads/exp_event","commits":[{"sha":"03e322603cb29e481b95d8eaba9de9c1de4a8fe2","author":{"name":"\"Alexander Redlinger\"","email":"92aab2ccd4f7af92cb08f44149d574f74e2617a1@gmail.com"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team3/commits/03e322603cb29e481b95d8eaba9de9c1de4a8fe2","message":"adapt the event test\n\tmodified:   calendar/app/models/Calendar.java\n\tmodified:   calendar/app/models/Event.java\n\tmodified:   calendar/app/models/User.java\n\tmodified:   calendar/test/modelTest/EventTest.java"},{"sha":"111f98d33130a4d2ec71742cad21e70682635d74","author":{"name":"\"Alexander Redlinger\"","email":"92aab2ccd4f7af92cb08f44149d574f74e2617a1@gmail.com"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team3/commits/111f98d33130a4d2ec71742cad21e70682635d74","message":"Merge remote-tracking branch 'origin/exp_event' into exp_event\n\nConflicts:\n\tcalendar/app/models/Calendar.java\n\tcalendar/app/models/Event.java"},{"sha":"936c6c90a31bd0d2e64fdf0a69f0565f9138fd80","author":{"name":"\"Alexander Redlinger\"","email":"92aab2ccd4f7af92cb08f44149d574f74e2617a1@gmail.com"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team3/commits/936c6c90a31bd0d2e64fdf0a69f0565f9138fd80","message":"rename boolean followable to isFollowable\n\tmodified:   calendar/app/models/Event.java"},{"sha":"6e19ece402bb455c674da29a233878926b658b03","author":{"name":"\"Alexander Redlinger\"","email":"92aab2ccd4f7af92cb08f44149d574f74e2617a1@gmail.com"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team3/commits/6e19ece402bb455c674da29a233878926b658b03","message":"Merge branch 'exp_event' into exp_event_alex\n\nConflicts:\n\tcalendar/app/models/Calendar.java\n\tcalendar/app/models/Event.java\n\tcalendar/app/models/User.java\n\n\tmodified:   calendar/app/controllers/Events.java\n\tmodified:   calendar/app/models/Calendar.java\n\tmodified:   calendar/app/models/Event.java\n\tnew file:   calendar/app/models/Event.java.orig\n\tmodified:   calendar/app/models/User.java\n\tdeleted:    calendar/test/data.yml\n\tmodified:   calendar/test/modelTest/EventTest.java"},{"sha":"0a2cf330e7e351aba53e7383f3378df9c96d4b03","author":{"name":"\"Alexander Redlinger\"","email":"92aab2ccd4f7af92cb08f44149d574f74e2617a1@gmail.com"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team3/commits/0a2cf330e7e351aba53e7383f3378df9c96d4b03","message":"remove not needed file\n\tdeleted:    calendar/app/models/Event.java.orig"}],"legacy":{"head":"0a2cf330e7e351aba53e7383f3378df9c96d4b03","size":5,"push_id":47147219,"shas":[["03e322603cb29e481b95d8eaba9de9c1de4a8fe2","a.rueedlinger@gmail.com","adapt the event test\n\tmodified:   calendar/app/models/Calendar.java\n\tmodified:   calendar/app/models/Event.java\n\tmodified:   calendar/app/models/User.java\n\tmodified:   calendar/test/modelTest/EventTest.java","\"Alexander Redlinger\""],["111f98d33130a4d2ec71742cad21e70682635d74","a.rueedlinger@gmail.com","Merge remote-tracking branch 'origin/exp_event' into exp_event\n\nConflicts:\n\tcalendar/app/models/Calendar.java\n\tcalendar/app/models/Event.java","\"Alexander Redlinger\""],["936c6c90a31bd0d2e64fdf0a69f0565f9138fd80","a.rueedlinger@gmail.com","rename boolean followable to isFollowable\n\tmodified:   calendar/app/models/Event.java","\"Alexander Redlinger\""],["6e19ece402bb455c674da29a233878926b658b03","a.rueedlinger@gmail.com","Merge branch 'exp_event' into exp_event_alex\n\nConflicts:\n\tcalendar/app/models/Calendar.java\n\tcalendar/app/models/Event.java\n\tcalendar/app/models/User.java\n\n\tmodified:   calendar/app/controllers/Events.java\n\tmodified:   calendar/app/models/Calendar.java\n\tmodified:   calendar/app/models/Event.java\n\tnew file:   calendar/app/models/Event.java.orig\n\tmodified:   calendar/app/models/User.java\n\tdeleted:    calendar/test/data.yml\n\tmodified:   calendar/test/modelTest/EventTest.java","\"Alexander Redlinger\""],["0a2cf330e7e351aba53e7383f3378df9c96d4b03","a.rueedlinger@gmail.com","remove not needed file\n\tdeleted:    calendar/app/models/Event.java.orig","\"Alexander Redlinger\""]],"ref":"refs/heads/exp_event"}}