Merge branch 'release' into develop

2018-03-08 00:30:37 +00:00
parent b4dab2e13c b5dfa54052
commit 37650ca674
3 changed files with 2 additions and 4 deletions
@@ -140,8 +140,6 @@ function _setUpNewUser (user) {
  user.items.quests.dustbunnies = 1;
  user.purchased.background.violet = true;
  user.preferences.background = 'violet';
-  user.items.gear.owned.armor_special_birthday = true; // eslint-disable-line camelcase
-  user.items.gear.equipped.body = 'armor_special_birthday';

  if (user.registeredThrough === 'habitica-web') {
    taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];