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/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -86,6 +86,7 @@ const SIMPLE_SETTINGS = [
    { id: "pinMentionedRooms" },
    { id: "pinUnreadRooms" },
    { id: "showDeveloperTools" },
+    { id: "alwaysRetryInvites" },
 ];

 // These settings must be defined in SettingsStore