GitHub PushEvent at 2014-05-08 11:22:16
Repository: genomizer-desktop
Actor: oi11ejn
Payload: {"shas":[["8d0cef62afe7efc7a8a6e34946f7ccdbbf745186","1610f9cabfb4a47f0386a5ed12e5d795c2970daa@cs.umu.se","UploadFileRow & Tab","oi11ejn",true],["6c96e1cbf52617b4f92a3717363149609d6ae943","1610f9cabfb4a47f0386a5ed12e5d795c2970daa@cs.umu.se","merged","oi11ejn",true],["8ecce268a16292e9806a929a48a2e6326d105f7e","1610f9cabfb4a47f0386a5ed12e5d795c2970daa@cs.umu.se","Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git\ninto dev\n\nConflicts:\n\tsrc/controller/Controller.java\n\tsrc/gui/UploadTab.java","oi11ejn",true],["ef2bc0175170eacdab6a69d6ec346b5db9fe4f3d","1610f9cabfb4a47f0386a5ed12e5d795c2970daa@cs.umu.se","Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git into dev","oi11ejn",true]],"size":4,"ref":"refs/heads/dev","head":"ef2bc0175170eacdab6a69d6ec346b5db9fe4f3d"}