habitica/common/locales/ru
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
..
_README_FIRST.md Moved folders into common directory 2015-01-21 10:34:04 -06:00
backgrounds.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
challenge.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
character.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
communityguidelines.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
content.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-09 22:18:22 -06:00
contrib.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
defaulttasks.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
front.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
gear.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
generic.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
groups.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
limited.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
messages.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
npc.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
pets.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
quests.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
questscontent.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
rebirth.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
settings.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00
spells.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
subscriber.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
tasks.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-12 13:42:11 -06:00