Scott Erickson d11b6a5751 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator ... Conflicts: bower.json		2014-04-11 12:44:29 -07:00
..
assets	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
collections	Fixed #405 with a sledgehammer--just loading all Components before loading level editor.	2014-03-15 12:31:39 -07:00
lib	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
locale	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
models	Added specific job profile photo support. Improved right column design a bit.	2014-04-10 17:54:28 -07:00
schemas	Finished minor refactorings	2014-04-11 20:09:50 +02:00
styles	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
templates	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
views	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
application.coffee	Fixed #418, no more print/save dialogues evaaarr.	2014-04-02 14:42:34 -07:00
initialize.coffee	Finished minor refactorings	2014-04-11 20:09:50 +02:00
treema-ext.coffee	Fixed a couple bugs in custom TreemaNodes.	2014-04-08 17:13:05 -07:00