7 commits

Author	SHA1	Message	Date
Scott Erickson	308adec7c7	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade	2014-04-11 22:52:00 -07:00
Scott Erickson	66d455285e	Integrated the delta view into the save view for levels.	2014-04-09 19:07:44 -07:00
Alexei Nikitin	5f062ad25c	Work on revert, save modal	2014-04-08 01:38:46 +04:00
Scott Erickson	13af9febbf	More fixes for #283	2014-01-27 18:44:05 -08:00
Nick Winter	00f4699ce5	Further fixes for save modals.	2014-01-10 17:32:29 -08:00
GlenDC	100a296951	Fixed Issue #26	2014-01-10 22:31:26 +01:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00