Alice Harris ab66f95c8e Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 ...

Conflicts:
	dist/habitrpg-shared.js

2015-01-06 15:26:59 +10:00

..

backgrounds.json

chore(i18n): update locales

2014-12-05 16:21:13 +01:00

challenge.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

character.json

Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12

2015-01-06 15:26:59 +10:00

communityguidelines.json

chore(i18n): update locales

2014-12-26 11:33:21 +01:00

content.json

chore(i18n): update locales

2014-12-18 22:56:34 +01:00

contrib.json

chore(i18n): update locales

2014-11-23 20:53:44 +01:00

defaulttasks.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

front.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

gear.json

Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12

2015-01-06 15:26:59 +10:00

generic.json

chore(i18n): update locales

2014-12-31 13:35:49 +01:00

groups.json

chore(i18n): update locales

2014-12-26 11:33:21 +01:00

limited.json

chore(i18n): update locales

2014-12-31 13:35:49 +01:00

messages.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

npc.json

chore(i18n): update locales

2014-12-31 13:35:49 +01:00

pets.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

quests.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

questscontent.json

chore(i18n): update locales

2014-12-26 11:33:21 +01:00

rebirth.json

chore(i18n): update locales, add pirate english

2014-11-03 19:29:01 +01:00

settings.json

Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12

2015-01-06 15:26:59 +10:00

spells.json

chore(i18n): update locales

2014-12-18 22:56:34 +01:00

subscriber.json

chore(i18n): update locales

2014-12-31 13:35:49 +01:00

tasks.json

chore(i18n): update locales

2014-11-15 18:06:45 +01:00