Tyler Renelle 5ee9f4904a Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop ... Conflicts: locales/en/gear.json		2014-11-29 08:26:23 -07:00
..
content.coffee	Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop	2014-11-29 08:26:23 -07:00
directives.js	Added space before "target=" when added to href	2014-11-01 23:04:00 +05:30
i18n.coffee	fix(coffee): ops, used js instead of coffee!	2014-09-12 14:51:20 +02:00
index.coffee	make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996	2014-11-25 05:16:36 +10:00
userServices.js	change ApiUrlService.getApiUrl to ApiUrlService.get	2014-09-16 19:33:16 +02:00