Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget

2018-06-22 11:31:54 +01:00 · 2018-06-22 11:31:54 +01:00 · 6252f5b818
commit 6252f5b818
parent 9d68c9e1a1 88ecaced82
69 changed files with 1789 additions and 1252 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -77,12 +77,6 @@ export const SETTINGS = {
    //     // level is always appended to the end.
    //     supportedLevelsAreOrdered: false,
    // },
-    "feature_rich_quoting": {
-        isFeature: true,
-        displayName: _td("Message Replies"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
    "feature_pinning": {
        isFeature: true,
        displayName: _td("Message Pinning"),