Merge pull request #2441 from matrix-org/develop

Merge develop -> experimental
2019-01-14 14:45:20 -07:00
parent 2a20d9d67e a3240358f1
commit 177d9f245a
5 changed files with 217 additions and 51 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -329,6 +329,11 @@ export const SETTINGS = {
        displayName: _td('Show empty room list headings'),
        default: true,
    },
+    "alwaysInviteUnknownUsers": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Always invite users which may not exist'),
+        default: false,
+    },
    "showDeveloperTools": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Show developer tools'),