GitHub PushEvent at 2014-07-03 12:36:00
Repository: di15
Actor: michielham
Payload: {"shas":[["b839643a6e7deba3116486cc31a965d024a70fa5","ffb4761cba839470133bee36aeb139f58d7dbaa9@kevinalberts.nl","Modifications","kurocon",false],["57b596a8a01bd1a767444d650619684e14d08e00","ffb4761cba839470133bee36aeb139f58d7dbaa9@kevinalberts.nl","More Modifications","kurocon",false],["50aea8b1f91e61213cfe7e2f9f0051e5323299db","ffb4761cba839470133bee36aeb139f58d7dbaa9@kevinalberts.nl","Merge branch 'transaction_overview' of https://github.com/utwente-di/di15 into transaction_overview\n\nConflicts:\n\tsrc/main/java/nl/utwente/di15/database/DatabaseQueries.java","kurocon",false],["c90676fa5a12dcff89ab94a4818544da3fd9e89b","1d7edff512a74696989c5558efd7c9d0c5e2e32b@gmail.com","in de servelets als userID == null dan naar emmaLogout wijzen","michielham",false],["b690d4fa7275a8f794611cc3ba7586260b8fdc5a","1d7edff512a74696989c5558efd7c9d0c5e2e32b@gmail.com","Merge branch 'transaction_overview' of https://github.com/utwente-di/di15 into transaction_overview","michielham",false]],"size":5,"ref":"refs/heads/master","head":"b690d4fa7275a8f794611cc3ba7586260b8fdc5a"}