Commit Graph

16 Commits

Author SHA1 Message Date
Blade Barringer f0e3360c35 chore(i18n): update locales 2015-08-14 17:52:37 -05:00
Blade Barringer 2ec7e631e9 Update locales 2015-08-10 07:52:07 -05:00
Blade Barringer 4bdb2a8b84 chore(i18n): update locales 2015-08-06 08:50:06 -05:00
Blade Barringer a888a120d9 chore(i18n): update locales 2015-07-30 23:25:04 -05:00
Blade Barringer 25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Blade Barringer 08a4e30b8e chore(i18n): update locales 2015-07-27 23:15:48 -05:00
Matteo Pagliazzi cca3e8bfdf chore(i18n): update locales 2015-06-30 17:59:11 +02:00
Matteo Pagliazzi 782ae4f81c chore(i18n): update locales 2015-06-23 10:43:29 +02:00
Matteo Pagliazzi d3353aa751 chore(i18n): update locales 2015-06-15 13:20:09 +02:00
Matteo Pagliazzi 995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Matteo Pagliazzi 047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
Matteo Pagliazzi 9b19bd5076 chore(i18n): update locales 2015-04-11 14:53:33 +02:00
Matteo Pagliazzi 695b00b6bb chore(i18n): update locales 2015-03-26 17:14:28 -04:00
Matteo Pagliazzi f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01: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