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

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

Browse Source
This commit is contained in:
David Baker
2017-05-26 17:30:02 +01:00
parent 84cef00f1f fde553a809
commit c22978d033
5 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/UserSettings.js
View File

@@ -70,7 +70,6 @@ const SETTINGS_LABELS = [
id: 'dontSendTypingNotifications',
label: "Don't send typing notifications",
},
/*
{
id: 'alwaysShowTimestamps',
label: 'Always show message timestamps',
@@ -79,6 +78,7 @@ const SETTINGS_LABELS = [
id: 'showTwelveHourTimestamps',
label: 'Show timestamps in 12 hour format (e.g. 2:30pm)',
},
/*
{
id: 'useCompactLayout',
label: 'Use compact timeline layout',