Merge branch 'develop' into travis/room-list/enable

2020-07-07 16:20:38 -06:00
parent 5ace405062 1b89e75a5d
commit 8357461c9b
3 changed files with 53 additions and 12 deletions
@@ -479,13 +479,13 @@ export const SETTINGS = {
            deny: [],
        },
    },
-    // TODO: Remove setting: https://github.com/vector-im/riot-web/issues/14231
+    // TODO: Remove setting: https://github.com/vector-im/riot-web/issues/14373
    "RoomList.orderAlphabetically": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td("Order rooms by name"),
        default: false,
    },
-    // TODO: Remove setting: https://github.com/vector-im/riot-web/issues/14231
+    // TODO: Remove setting: https://github.com/vector-im/riot-web/issues/14373
    "RoomList.orderByImportance": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td("Show rooms with unread notifications first"),