Merge branch 'develop' into sabrecat/usernames-master

2018-11-01 21:51:33 -05:00
parent 86ae5f3e44 90eebbcd70
commit 112e4e1d76
38 changed files with 509 additions and 491 deletions
@@ -62,6 +62,7 @@ export default {
      ]),
      // list of email-only notifications
      onlyEmailsIds: Object.freeze([
+        'kickedGroup',
        'importantAnnouncements',
        'weeklyRecaps',
        'onboarding',