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

Deduplicate join rule management between rooms and spaces #6724

Merged
merged 6 commits into from
Sep 10, 2021
Merged

Deduplicate join rule management between rooms and spaces #6724

merged 6 commits into from
Sep 10, 2021

Commits on Sep 1, 2021

  1. Deduplicate join rule management between rooms and spaces

    @t3chguy
    t3chguy committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    979bc71 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2021

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

    … t3chguy/fix/18798

� Conflicts:
�	src/i18n/strings/en_EN.json
    @t3chguy
    t3chguy committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    600375c View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2021

  1. fix react error in console

    @t3chguy
    t3chguy committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    fa60b24 View commit details
    Browse the repository at this point in the history

  2. Tweak edge case behaviour

    @t3chguy
    t3chguy committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    2eb64de View commit details
    Browse the repository at this point in the history

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

    … t3chguy/fix/18798

� Conflicts:
�	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
    @t3chguy
    t3chguy committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    6308359 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. add comment

    @t3chguy
    t3chguy committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    2a8e8b9 View commit details
    Browse the repository at this point in the history