Scott Erickson dbbf9ce8b3 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master ... Conflicts: app/styles/editor/level/thangs_tab.sass app/templates/editor/level/thangs_tab.jade app/views/editor/level/thangs_tab_view.coffee		2014-03-20 11:22:23 -07:00
..
article	Resolved merge conflict.	2014-03-12 08:29:42 -07:00
component	Added a versions modal for every type	2014-03-10 23:29:34 +01:00
components	Fixed some bugs from the migration from _.cloneDeep to $.extend	2014-03-18 13:47:51 -07:00
level	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master	2014-03-20 11:22:23 -07:00
thang	Switching from the slow _.cloneDeep to the fast $.extend	2014-03-18 13:08:26 -07:00