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
..
login.sass	Added social buttons to Sign up modal	2014-04-10 01:01:30 +05:30
recover.sass	Ready for action, sir!	2014-01-03 10:32:13 -08:00
revert.sass	Set up a backup system for the editor using localStorage.	2014-01-26 14:46:25 -08:00
save_version.sass	Added data merge conflict handling.	2014-04-11 21:11:52 -07:00
wizard_settings.sass	Fixing the wizard settings modal.	2014-02-24 09:06:50 -08:00