Mikhail Koltsov a6523719e4 Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks ... Conflicts: app/locale/ru.coffee		2014-03-20 09:07:11 +04:00
..
article	Ready for action, sir!	2014-01-03 10:32:13 -08:00
components	thang editor: added i18n binding to 'Save' button	2014-03-19 01:43:27 +04:00
level	Fix for #272 bug.	2014-03-18 05:47:53 +01:00
thang	Added a 'stop' button for viewing end animations on thang types.	2014-02-12 16:18:25 -08:00