Merge branch 'release' into develop

2018-02-20 21:16:43 +00:00
parent 8fabadfc67 416c24d1e2
commit 695f53758a
18 changed files with 127 additions and 12 deletions
@@ -60,6 +60,7 @@ for (let key in weapon) {

      return `${oldnotes(lang)} ${twoHandedText}`;
    };
+    item.notes.i18nLangFunc = true; // See https://github.com/HabitRPG/habitica/blob/develop/website/common/script/content/translation.js#L8
  }
 }