George Saines d1f6b6ef51 Merge branch 'master' of https://github.com/codecombat/codecombat		2014-09-04 16:59:52 -07:00
..
assets	redoing the about page	2014-09-04 16:59:46 -07:00
collections	Merged master into feature/realtime-multiplayer; looks good.	2014-09-03 16:14:33 -07:00
lib	Fixed a few tome / canvas resizing bugs.	2014-09-03 18:35:14 -07:00
locale	redoing the about page	2014-09-04 16:59:46 -07:00
models	Protection and logging for #1463. Fixed an issue with spectate camera script bounds.	2014-09-04 11:04:23 -07:00
schemas	A few minor fixes.	2014-09-04 15:14:27 -07:00
styles	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-09-04 16:59:52 -07:00
templates	redoing the about page	2014-09-04 16:59:46 -07:00
views	A few minor fixes.	2014-09-04 15:14:27 -07:00
application.coffee	Merge conflicts.	2014-08-26 09:53:04 -07:00
initialize.coffee	Merged master into feature/realtime-multiplayer; looks good.	2014-09-03 16:14:33 -07:00
Router.coffee	Fixed #1458.	2014-08-30 20:27:58 -07:00
treema-ext.coffee	Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.	2014-08-31 12:21:25 -07:00