Commit Graph

16 Commits

Author SHA1 Message Date
Blade Barringer 01e2c30795 chore(i18n): update locales 2015-08-11 07:38:42 -05:00
Matteo Pagliazzi 0a340de9c8 chore(i18n): update locales 2015-08-11 14:32:00 +02:00
Blade Barringer 25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Matteo Pagliazzi 5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Matteo Pagliazzi 1618534785 chore(i18n): update locales 2015-07-05 20:51:08 +02:00
Matteo Pagliazzi f6480faf22 chore(i18n): update locales 2015-07-03 10:49:35 +02:00
Matteo Pagliazzi 4ee3e711d1 chore(i18n): update locales 2015-06-08 18:57:38 +02:00
Matteo Pagliazzi 047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
Matteo Pagliazzi d6547682be chore(i18n): update locales 2015-05-17 15:54:18 +02:00
Matteo Pagliazzi a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Matteo Pagliazzi 0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
Matteo Pagliazzi 72f8c60ccf chore(i18n): update locales 2015-05-02 11:43:38 +02:00
Matteo Pagliazzi e470764b06 chore(i18n): update locales 2015-04-07 14:03:48 +02:00
Matteo Pagliazzi 61db64e963 chore(i18n): update locales 2015-04-03 13:28:45 +02:00
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
Blade Barringer c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00