Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2019-01-27 18:14:51 +01:00
parent c66d2cb469 8904c58510
commit faa0611ab2
807 changed files with 41837 additions and 36396 deletions
@@ -29,7 +29,7 @@ import shared from '../../../common';
 import apiError from '../../libs/apiError';

 const MAX_EMAIL_INVITES_BY_USER = 200;
-const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL');
+const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL');

 /**
 * @apiDefine GroupBodyInvalid