Tyler Renelle 18ccbb51df Merge remote-tracking branch 'colegleason/drops' into develop ...

Conflicts:
	dist/habitrpg-shared.js

2014-01-15 17:40:07 -07:00

..

content.coffee

Fix typos

2014-01-11 17:54:50 -03:00

directives.js

move markdown directive out of main site into shared (so mobile can use it)

2014-01-14 11:11:14 -07:00

index.coffee

Merge remote-tracking branch 'colegleason/drops' into develop

2014-01-15 17:40:07 -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