GitHub PushEvent at 2014-11-05 22:57:55
Repository: PA165-DnD-Troops
Actor: hubacdavid
Payload: {"shas":[["c6cb38cba14b7b962645b2f7abe8cef1dcdd029b","67332940009800b6400dddab7709a7dd9b148231@mail.muni.cz","Some test and binary changes","hubacdavid",true],["8edebdd935d7ac9d68625497e6cc045958aabe1c","67332940009800b6400dddab7709a7dd9b148231@mail.muni.cz","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\n\tDnDTroopsProject/target/classes/cz/fi/muni/pa165/converter/RoleConverter.class","hubacdavid",true]],"size":2,"ref":"refs/heads/master","head":"8edebdd935d7ac9d68625497e6cc045958aabe1c"}