Sabe Jones 95bb5be22a Merge branch 'develop' into armoire ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png

2015-06-04 15:49:06 -05:00

..

public

remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately)

2015-03-22 17:50:22 +10:00

content.coffee

Merge branch 'develop' into armoire

2015-06-04 15:49:06 -05:00

i18n.coffee

Repair Broken Test Suite - Full Passing Tests

2015-03-24 21:39:03 -04:00

index.coffee

feat(Armoire): Improved counter

2015-06-04 15:45:55 -05:00