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): update migrated conversation with correct group id and cipher suites (WPB-9169) 🍒 #2771

Merged
merged 10 commits into from
May 27, 2024
Merged

fix(mls): update migrated conversation with correct group id and cipher suites (WPB-9169) 🍒 #2771

merged 10 commits into from
May 27, 2024

Commits on May 16, 2024

  1. Commit with unresolved merge conflicts

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

  2. Commit with unresolved merge conflicts

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

Commits on May 24, 2024

  1. Merge branch 'release/candidate' into fix/respect-default-protocol-in… 

    …-1on1-initialisation-cherry-pick
    @mchenani
    mchenani authored May 24, 2024
    Configuration menu
    Copy the full SHA
    4957b26 View commit details
    Browse the repository at this point in the history

  2. trigger CI

    @mchenani
    mchenani committed May 24, 2024
    Configuration menu
    Copy the full SHA
    5ac1091 View commit details
    Browse the repository at this point in the history

  3. fix tests to match candidate changes

    @mchenani
    mchenani committed May 24, 2024
    Configuration menu
    Copy the full SHA
    66a4fed View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. resolve conflicts

    @mchenani
    mchenani committed May 27, 2024
    Configuration menu
    Copy the full SHA
    efd89ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/candidate' into fix/mls-migration-cs-cherry-pick

    @mchenani
    mchenani authored May 27, 2024
    Configuration menu
    Copy the full SHA
    569eef5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release/candidate' of https://github.com/wireapp/kalium … 

    …into fix/mls-migration-cs-cherry-pick
    @mchenani
    mchenani committed May 27, 2024
    Configuration menu
    Copy the full SHA
    2d76b9f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/fix/mls-migration-cs-cherry-pick… 

    …' into fix/mls-migration-cs-cherry-pick
    @mchenani
    mchenani committed May 27, 2024
    Configuration menu
    Copy the full SHA
    3f4b735 View commit details
    Browse the repository at this point in the history

  5. fix tests

    @mchenani
    mchenani committed May 27, 2024
    Configuration menu
    Copy the full SHA
    83ece3d View commit details
    Browse the repository at this point in the history