Michael Schmatz f05af0fbe7 Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/assets/javascripts/workers/worker_world.js		2014-05-09 14:50:08 -07:00
..
assets	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-09 14:50:08 -07:00
collections	Migrated and fixed the rest of the views using the new loading system.	2014-04-28 11:52:04 -07:00
lib	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-09 14:50:08 -07:00
locale	Set up the versions modal to display changes between versions when you select two of them.	2014-05-08 10:54:39 -07:00
models	Merged the bug fix which I did too.	2014-05-08 13:43:15 -07:00
schemas	Added i18n for translating specific articles now, too.	2014-05-05 19:14:38 -07:00
styles	Make components' patches tab and systems' patches tab look consistent	2014-05-06 17:34:13 -04:00
templates	Set up the versions modal to display changes between versions when you select two of them.	2014-05-08 10:54:39 -07:00
views	Removed includeeFlow, since we're going to do it lazily with the debug worker.	2014-05-09 09:29:50 -07:00
application.coffee	Merge feature/linkedin into master	2014-04-25 08:47:31 -07:00
initialize.coffee	Removed an import that no longer exists.	2014-04-11 13:18:05 -07:00
treema-ext.coffee	Merge branch 'master' into feature/loading-views	2014-04-25 14:31:58 -07:00