Commit Graph

17 Commits

Author SHA1 Message Date
Blade Barringer 919c072b5d chore(i18n): update locales 2015-08-02 10:30:43 -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
Matteo Pagliazzi 6cf0840c71 chore(i18n): update locales 2015-07-14 13:55:03 +02:00
Matteo Pagliazzi 4b170cd4dc chore(i18n): update locales 2015-07-12 23:45:26 +02:00
Matteo Pagliazzi 5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Matteo Pagliazzi d3353aa751 chore(i18n): update locales 2015-06-15 13:20:09 +02:00
Matteo Pagliazzi b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02:00
Matteo Pagliazzi ca3ac96d6d chore(i18n): update locales 2015-04-23 20:49:53 +02:00
Matteo Pagliazzi e474f0300c chore(i18n): update locales 2015-04-15 17:13:07 +02:00
Matteo Pagliazzi 4fe740a403 chore(i18n): update locales 2015-04-13 19:31:53 +02:00
Matteo Pagliazzi e470764b06 chore(i18n): update locales 2015-04-07 14:03:48 +02:00
Matteo Pagliazzi 9a76552072 chore(i18n): update locales 2015-04-04 12:36:55 +02:00
Matteo Pagliazzi 34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +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 4588be29ee Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
Blade Barringer c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00