Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
840179001731a655fc80762444dad91706570681
habitica/script
T
History
Alice Harris 8401790017 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	locales/cs/gear.json
	locales/de/gear.json
	locales/de/generic.json
	locales/de/subscriber.json
	locales/es/communityguidelines.json
	locales/es/gear.json
	locales/es/generic.json
	locales/es_419/communityguidelines.json
	locales/es_419/gear.json
	locales/es_419/generic.json
	locales/es_419/questscontent.json
	locales/fr/gear.json
	locales/fr/generic.json
	locales/fr/limited.json
	locales/hu/backgrounds.json
	locales/hu/communityguidelines.json
	locales/hu/content.json
	locales/hu/front.json
	locales/hu/gear.json
	locales/hu/generic.json
	locales/hu/groups.json
	locales/hu/limited.json
	locales/hu/messages.json
	locales/hu/npc.json
	locales/hu/pets.json
	locales/hu/questscontent.json
	locales/hu/subscriber.json
	locales/hu/tasks.json
	locales/it/gear.json
	locales/it/generic.json
	locales/it/groups.json
	locales/it/limited.json
	locales/it/subscriber.json
	locales/nl/gear.json
	locales/nl/limited.json
	locales/nl/questscontent.json
	locales/pl/gear.json
	locales/pl/limited.json
	locales/pl/subscriber.json
	locales/pt/gear.json
	locales/ro/gear.json
	locales/ru/gear.json
	locales/ru/limited.json
	script/content.coffee
2015-01-18 15:46:25 +10:00
..
config.js
refactor(config): add mobile
2015-01-16 18:31:37 -07:00
content.coffee
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2015-01-18 15:46:25 +10:00
directives.js
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2015-01-06 15:26:59 +10:00
i18n.coffee
fix(coffee): ops, used js instead of coffee!
2014-09-12 14:51:20 +02:00
index.coffee
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2015-01-18 15:46:25 +10:00
userServices.js
refactor(services): move to a single "habitrpg" module for services /
2015-01-17 18:42:01 -07:00