GitHub PushEvent at 2014-05-13 07:40:28
Repository: webapplication
Actor: koningj006
Payload: {"shas":[["0d5db8db8c5981c3bf540fb8b0a8134a0a7c98dc","11f05561b66bfcd5af8a179e0c744bc7915d2726@0101E_LTJKG.gpgroot.loc","Merge origin/develop into develop\n\nConflicts:\n\tsrc/java/controller/ProfileController.java\n\tsrc/java/controller/ProjectController.java\n\tweb/WEB-INF/view/modifyProject.jsp","jkg",true]],"size":1,"ref":"refs/heads/develop","head":"0d5db8db8c5981c3bf540fb8b0a8134a0a7c98dc"}