GitHub PushEvent at 2014-07-25 16:33:18
Repository: MapStoryComposer
Actor: reynalddizon
Payload: {"shas":[["ceff3c603687a2559d96f39ed6efe9b7c0062027","a9157c856e5cc50b84e540f829e6fe60d04a489d@Reynaldos-MacBook-Pro.local","Tooltips","reynalddizon",true],["2b4038d9ca7d93af2d3529054687ecb3fb609c32","a9157c856e5cc50b84e540f829e6fe60d04a489d@Reynaldos-MacBook-Pro.local","Merge branch 'master' of https://github.com/jsiochi/MapStoryComposer\n\nConflicts:\n\tstorylayers.html","reynalddizon",true]],"size":2,"ref":"refs/heads/master","head":"2b4038d9ca7d93af2d3529054687ecb3fb609c32"}