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

2017-05-26 17:30:02 +01:00 · 2017-05-26 17:30:02 +01:00 · c22978d033
commit c22978d033
parent 84cef00f1f fde553a809
5 changed files with 55 additions and 33 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -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',