1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00

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

This commit is contained in:
Matthew Hodgson
2017-04-22 01:36:38 +01:00
committed by GitHub
4 changed files with 18 additions and 4 deletions

View File

@@ -48,6 +48,10 @@ const SETTINGS_LABELS = [
id: 'hideReadReceipts',
label: 'Hide read receipts'
},
{
id: 'dontSendTypingNotifications',
label: "Don't send typing notifications",
},
/*
{
id: 'alwaysShowTimestamps',