Merge branch 'master' into PLT-1429

This commit is contained in:
=Corey Hulen
2016-02-03 10:45:58 -08:00
74 changed files with 2924 additions and 866 deletions

View File

@@ -68,6 +68,8 @@
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
"EnableSignInWithEmail": true,
"EnableSignInWithUsername": false,
"SendEmailNotifications": false,
"RequireEmailVerification": false,
"FeedbackName": "",