Commit graph

9 commits

Author SHA1 Message Date
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
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
2937c13f6b chore(i18n): update locales 2015-03-29 22:30:53 +02:00
Matteo Pagliazzi
37433ee1aa chore(i18n): update locales 2015-02-18 17:41:31 +01:00
Blade Barringer
6f4fbfeaeb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
2015-02-03 19:26:14 -06: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
Renamed from locales/es_419/front.json (Browse further)