Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(mls): set removal-keys for 1on1 calls from conversation-response (WPB-10743) 🍒 #3019

Merged
merged 11 commits into from
Sep 26, 2024
Merged

fix(mls): set removal-keys for 1on1 calls from conversation-response (WPB-10743) 🍒 #3019

merged 11 commits into from
Sep 26, 2024

Commits on Sep 18, 2024

  1. Commit with unresolved merge conflicts

    @mchenani @github-actions
    mchenani authored and github-actions[bot] committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c4fad36 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/release/candidate' … 

    …into fix/federated-1on1-removal-keys-cherry-pick
    @MohamadJaara
    MohamadJaara committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    72b2090 View commit details
    Browse the repository at this point in the history

  2. fix merge conflicts

    @MohamadJaara
    MohamadJaara committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    c81a62d View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. fix merge conflicts

    @MohamadJaara
    MohamadJaara committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    938ae5c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/candidate' into fix/federated-1on1-removal-keys… 

    …-cherry-pick
    @MohamadJaara
    MohamadJaara authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    3368c9e View commit details
    Browse the repository at this point in the history

  3. fix merge conflicts

    @MohamadJaara
    MohamadJaara committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    4e0ddfa View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/candidate' into fix/federated-1on1-removal-keys… 

    …-cherry-pick
    @MohamadJaara
    MohamadJaara authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    efe8e61 View commit details
    Browse the repository at this point in the history

  5. fix merge conflicts

    @MohamadJaara
    MohamadJaara committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b4d3c62 View commit details
    Browse the repository at this point in the history

  6. fix stalling test

    @MohamadJaara
    MohamadJaara committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    aa40054 View commit details
    Browse the repository at this point in the history

  7. fix tests

    @MohamadJaara
    MohamadJaara committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    ea96ec6 View commit details
    Browse the repository at this point in the history

  8. fix tests

    @MohamadJaara
    MohamadJaara committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    26555fc View commit details
    Browse the repository at this point in the history