Merge remote-tracking branch 'origin/develop' into matthew/status

2017-11-10 15:29:42 -08:00 · 2017-11-10 15:29:42 -08:00 · a0cdaf29f9
commit a0cdaf29f9
parent 58ee4d0a76 b3ddec4131
30 changed files with 2153 additions and 294 deletions
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@ -26,10 +26,6 @@ import SdkConfig from './SdkConfig';
 */

 const FEATURES = [
-    {
-        id: 'feature_groups',
-        name: _td("Communities"),
-    },
    {
        id: 'feature_pinning',
        name: _td("Message Pinning"),