Sabe Jones 8074648c70 Merge branch 'develop' into tutorial ...

Conflicts:
	common/locales/en/npc.json

2015-05-31 15:52:12 -05:00

..

backgrounds.json

feat(backgrounds): May BGs

2015-05-06 19:41:54 -05:00

challenge.json

challenge task text

2015-05-27 16:14:24 -07:00

character.json

Correct text

2015-05-17 10:06:40 -05:00

communityGuidelines.json

Patched translation fixes and added a few phrases to locales.

2015-05-03 23:41:42 +05:30

content.json

feat(pets): Sheep Quest

2015-05-20 20:45:18 -07:00

contrib.json

feat(surveys): Close out survey

2015-03-19 21:44:42 -05:00

defaultTasks.json

feat(tour): Revised intro tutorial

2015-05-29 14:03:42 -05:00

front.json

Made text on static/contact translatable

2015-05-24 13:31:29 +05:00

gear_README.md

Moved folders into common directory

2015-01-21 10:34:04 -06:00

gear.json

feat(subscriber): May Mystery Items

2015-05-25 21:03:13 -05:00

generic.json

feat(tour): Revised intro tutorial

2015-05-29 14:03:42 -05:00

groups.json

Made gift dialog translatable

2015-05-26 17:18:18 +05:00

limited.json

fix(seasonal): Sneaky floral

2015-04-01 23:19:54 -05:00

messages.json

Fixes #4749

2015-02-24 16:58:48 -06:00

npc.json

Merge branch 'develop' into tutorial

2015-05-31 15:52:12 -05:00

pets.json

Merge pull request #4969 from Alys/explain-drops-2015-03-04

2015-04-14 18:22:47 +10:00

quests.json

boss damage text

2015-05-27 16:12:37 -07:00

questsContent.json

feat(pets): Sheep Quest

2015-05-20 20:45:18 -07:00

rebirth.json

Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

2015-02-01 14:07:18 -06:00

settings.json

Add translatable strings

2015-05-14 21:56:16 -05:00

spells.json

Update spells.json

2015-05-08 18:32:18 -07:00

subscriber.json

Removed unused strings and altered custom day start text. (#5006)

2015-04-14 14:23:20 -07:00

tasks.json

Merge branch 'develop' into tutorial

2015-05-31 15:52:12 -05:00