Matteo Pagliazzi
|
fa2c44a9c7
|
chore(i18n): update locales
|
2015-03-20 17:13:53 +01:00 |
|
Matteo Pagliazzi
|
6d163ecb5d
|
chore(i18n): update locales
|
2015-03-18 12:13:36 +01:00 |
|
Matteo Pagliazzi
|
b0b6864f1c
|
chore(i18n): update locales
|
2015-03-16 19:56:35 +01:00 |
|
Matteo Pagliazzi
|
37433ee1aa
|
chore(i18n): update locales
|
2015-02-18 17:41:31 +01:00 |
|
Blade Barringer
|
9ddb5e35fb
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/dist/sprites/habitrpg-shared.css
common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
|
2015-02-12 13:42:11 -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 |
|