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

Replace kick terminology with Remove from chat #7469

Merged
merged 5 commits into from
Jan 14, 2022
Merged

Replace kick terminology with Remove from chat #7469

merged 5 commits into from
Jan 14, 2022

Commits on Jan 6, 2022

  1. Replace kick terminology with Remove from chat

    @t3chguy
    t3chguy committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    4483d4c View commit details
    Browse the repository at this point in the history

  2. Fix i18n

    @t3chguy
    t3chguy committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    0ad2fa1 View commit details
    Browse the repository at this point in the history

  3. Make snapshot happy again

    @t3chguy
    t3chguy committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    9b4ec31 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2022

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

    … t3chguy/fix/9547

� Conflicts:
�	src/i18n/strings/en_EN.json
    @t3chguy
    t3chguy committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    7b95202 View commit details
    Browse the repository at this point in the history

  2. i18n plurals

    @t3chguy
    t3chguy committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    07c87f4 View commit details
    Browse the repository at this point in the history