Cole Gleason 8fdae0b35c Merge branch 'sabe/attributes' into develop ... Conflicts: dist/habitrpg-shared.js locales/en/main.json		2014-01-30 10:44:49 -06:00
..
content.coffee	Merge pull request #117 from deilann/dequip-1	2014-01-26 12:06:50 -08: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 branch 'sabe/attributes' into develop	2014-01-30 10:44:49 -06: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