Merge branch 'develop' into travis/hide-read-receipts

2017-04-22 01:36:38 +01:00 · 2017-04-22 01:36:38 +01:00 · 872d0e0f50
commit 872d0e0f50
parent e4c4adc517 b36eb90a10
4 changed files with 18 additions and 4 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -48,6 +48,10 @@ const SETTINGS_LABELS = [
        id: 'hideReadReceipts',
        label: 'Hide read receipts'
    },
+    {
+        id: 'dontSendTypingNotifications',
+        label: "Don't send typing notifications",
+    },
 /*
    {
        id: 'alwaysShowTimestamps',