GitHub PushEvent at 2014-12-12 11:48:50
Repository: work2
Actor: lor2
Payload: {"shas":[["4e0804fd7fe6e92eabd02a82f87bb22eb8d0e561","21c24d56f8b6afb0c54f36f682239a22c90e56e7@mail.ru","edited","lor2",true],["deb8e66ded0f2c66b3b26966edd060676c498a52","21c24d56f8b6afb0c54f36f682239a22c90e56e7@mail.ru","edited","lor2",true],["4611345f83bf555bd230bb6a33d3ae044813b90a","21c24d56f8b6afb0c54f36f682239a22c90e56e7@mail.ru","Merge branch 'master' of https://github.com/lor2/Work2\n\nConflicts:\n\tjstore/.idea/workspace.xml\n\tjstore/src/main/java/uz/micros/jstore/controller/HelpController.java\n\tjstore/src/main/webapp/pages/help.jsp\n\tjstore/target/jstore/pages/help.jsp","lor2",true]],"size":3,"ref":"refs/heads/master","head":"4611345f83bf555bd230bb6a33d3ae044813b90a"}