Merge pull request #2444 from matrix-org/develop

Develop->Experimental
This commit is contained in:
Travis Ralston 2019-01-15 10:39:34 -07:00 committed by GitHub
commit 731e05cc5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -85,7 +85,7 @@ const SIMPLE_SETTINGS = [
{ id: "pinMentionedRooms" }, { id: "pinMentionedRooms" },
{ id: "pinUnreadRooms" }, { id: "pinUnreadRooms" },
{ id: "showDeveloperTools" }, { id: "showDeveloperTools" },
{ id: "alwaysRetryInvites" }, { id: "alwaysInviteUnknownUsers" },
]; ];
// These settings must be defined in SettingsStore // These settings must be defined in SettingsStore