Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

fix historical section #2016

Merged
merged 4 commits into from
Jun 26, 2018
Merged

fix historical section #2016

merged 4 commits into from
Jun 26, 2018

Commits on Jun 26, 2018

  1. give Historical an emptyContent to make it look more consistent 

    and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <[email protected]>
    @t3chguy
    t3chguy committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    9b50daa View commit details
    Browse the repository at this point in the history

  2. run gen-i18n and prune-i18n 

    Signed-off-by: Michael Telatynski <[email protected]>
    @t3chguy
    t3chguy committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    cdf7101 View commit details
    Browse the repository at this point in the history

  3. Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.c… 

    …om:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist

Signed-off-by: Michael Telatynski <[email protected]>

# Conflicts:
#	src/i18n/strings/en_EN.json
    @t3chguy
    t3chguy committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    f5519c2 View commit details
    Browse the repository at this point in the history

  4. clear up if statement to make it more readable 

    Signed-off-by: Michael Telatynski <[email protected]>
    @t3chguy
    t3chguy committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    abd37d1 View commit details
    Browse the repository at this point in the history