codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 08:50:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
codecombat/app
History
Scott Erickson c5b9b103c5 Merge branch 'feature/team-colors' 
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
2014-01-16 10:14:21 -08:00
..
assets Set up thang avatar views with the new db portraits. 2014-01-09 14:04:46 -08:00
collections Ready for action, sir! 2014-01-03 10:32:13 -08:00
lib Merge branch 'feature/team-colors' 2014-01-16 10:14:21 -08:00
locale Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
models Merge branch 'feature/team-colors' 2014-01-16 10:14:21 -08:00
styles Merge branch 'feature/team-colors' 2014-01-16 10:14:21 -08:00
templates Merge branch 'feature/team-colors' 2014-01-16 10:14:21 -08:00
views Merge branch 'feature/team-colors' 2014-01-16 10:14:21 -08:00
application.coffee Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -08:00
initialize.coffee Ready for action, sir! 2014-01-03 10:32:13 -08:00
treema-ext.coffee Ready for action, sir! 2014-01-03 10:32:13 -08:00