habitica-self-host/common/locales/en@pirate
Blade Barringer 88be8f3274 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
	common/img/sprites/spritesmith/npcs/npc_justin_broken.png
	common/img/sprites/spritesmith/npcs/npc_matt_broken.png
	img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
	img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
	img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	img/sprites/spritesmith/npcs/npc_bailey_broken.png
	img/sprites/spritesmith/npcs/npc_justin_broken.png
	img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
..
backgrounds.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
challenge.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
character.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
communityguidelines.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
content.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
contrib.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
defaulttasks.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
front.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
gear.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
generic.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
groups.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
limited.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
messages.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
npc.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
pets.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
quests.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
questscontent.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06: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 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
spells.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
subscriber.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
tasks.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00