 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
|
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
|
782ae4f81c
|
chore(i18n): update locales
|
2015-06-23 10:43:29 +02:00 |
|
|
Matteo Pagliazzi
|
695b00b6bb
|
chore(i18n): update locales
|
2015-03-26 17:14:28 -04: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 |
|