Tyler Renelle 19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop ...

Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png

2013-12-31 07:56:35 -07:00

..

content.coffee

classes: temporary stopgap for

2013-12-29 16:58:45 -07:00

index.coffee

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 07:56:35 -07:00

userServices.js

APIv2: instead of passing req to callback, passing response object so API can return the object when wrapped on the server

2013-12-28 11:51:38 -07:00