{"ref":"refs/heads/master","push_id":54815274,"commits":[{"sha":"95f0c2077a69e4997241614eadcfa240189f11a7","author":{"email":"eaf983a1eee1209dc4244dca7e16d441eaf5d8d3@solnet.ch","name":"Lukas Keller"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team5/commits/95f0c2077a69e4997241614eadcfa240189f11a7","message":"GroupList: improved view\n\n\tmodified:   app/views/Application/search.html\n\tmodified:   app/views/tags/groupList.html"},{"sha":"3703da04b922d4167435bdf3ad44d9daec31ed88","author":{"email":"eaf983a1eee1209dc4244dca7e16d441eaf5d8d3@solnet.ch","name":"Lukas Keller"},"url":"https://api.github.com/repos/ese-unibe-ch/ese2011-team5/commits/3703da04b922d4167435bdf3ad44d9daec31ed88","message":"Merge branch 'master' of github.com:ese-unibe-ch/ese2011-team5\n\nConflicts:\n\tapp/views/tags/groupList.html\n\n\tmodified:   app/controllers/Application.java\n\tmodified:   app/controllers/Events.java\n\tmodified:   app/controllers/Security.java\n\tmodified:   app/models/ESEEvent.java\n\tmodified:   app/views/Application/search.html\n\tmodified:   app/views/leftbox.html\n\tmodified:   app/views/tags/groupList.html\n\tnew file:   public/images/addfriend.jpg"}],"head":"3703da04b922d4167435bdf3ad44d9daec31ed88","size":2}