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

De-labs Metaspaces #7613

Merged
merged 5 commits into from
Jan 25, 2022
Merged

De-labs Metaspaces #7613

merged 5 commits into from
Jan 25, 2022

Commits on Jan 24, 2022

  1. De-labs Metaspaces

    @t3chguy
    t3chguy committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    2fc88f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. Merge branch 'develop' into t3chguy/delabs-metaspaces

    @t3chguy
    t3chguy authored Jan 25, 2022
    Configuration menu
    Copy the full SHA
    baa06a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/delabs-metaspaces

� Conflicts:
�	src/i18n/strings/en_EN.json
�	src/settings/Settings.tsx
    @t3chguy
    t3chguy committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    41115d0 View commit details
    Browse the repository at this point in the history

  3. Tweak margins in the sidebar settings tab to closer match other tabs

    @t3chguy
    t3chguy committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    644117e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/delabs-metaspaces
    @t3chguy
    t3chguy committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    d0a8db3 View commit details
    Browse the repository at this point in the history