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

This commit is contained in:
negue
2019-01-27 18:14:51 +01:00
807 changed files with 41837 additions and 36396 deletions

View File

@@ -12,7 +12,7 @@ import { model as Group } from '../../models/group';
import { chatModel as Chat } from '../../models/message';
import apiError from '../apiError';
const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL');
const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL');
const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map((email) => {
return { email, canSend: true };
});