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

Eliminate the use of MatrixClientPeg in utils #10910

Merged
merged 7 commits into from
May 23, 2023
Merged

Eliminate the use of MatrixClientPeg in utils #10910

merged 7 commits into from
May 23, 2023

Commits on May 16, 2023

  1. Eliminate the use of MatrixClientPeg in utils

    @t3chguy
    t3chguy committed May 16, 2023
    Configuration menu
    Copy the full SHA
    4eff101 View commit details
    Browse the repository at this point in the history

  2. Iterate

    @t3chguy
    t3chguy committed May 16, 2023
    Configuration menu
    Copy the full SHA
    898891b View commit details
    Browse the repository at this point in the history

  3. Iterate

    @t3chguy
    t3chguy committed May 16, 2023
    Configuration menu
    Copy the full SHA
    88d045e View commit details
    Browse the repository at this point in the history

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

     into t3chguy/kill-client-peg-1

# Conflicts:
#	src/utils/IdentityServerUtils.ts
    @t3chguy
    t3chguy committed May 16, 2023
    Configuration menu
    Copy the full SHA
    c2850eb View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

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

     into t3chguy/kill-client-peg-1

# Conflicts:
#	src/components/views/rooms/EditMessageComposer.tsx
    @t3chguy
    t3chguy committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f2df2e2 View commit details
    Browse the repository at this point in the history

  2. Iterate

    @t3chguy
    t3chguy committed May 23, 2023
    Configuration menu
    Copy the full SHA
    e5775ce View commit details
    Browse the repository at this point in the history

  3. Iterate

    @t3chguy
    t3chguy committed May 23, 2023
    Configuration menu
    Copy the full SHA
    42cd700 View commit details
    Browse the repository at this point in the history