Code

fix: multiple merge conflicts#2405

Code

Merged

Garzas merged 3 commits intorelease/candidatewireapp/wire-android:release/candidatefrom fix/cherry-pick-conflictswireapp/wire-android:fix/cherry-pick-conflictsCopy head branch name to clipboardNov 13, 2023

+6-5

Commits

Commits on Nov 9, 2023

• fix: multiple merge conflicts

  Garzas

  committed
  f46d9d9

  Copy full SHA for f46d9d9

Commits on Nov 10, 2023

• kalium update

  Garzas

  committed
  1c923e8

  Copy full SHA for 1c923e8

Commits on Nov 13, 2023

• Merge branch 'release/candidate' into fix/cherry-pick-conflicts

  Garzas

  committed
  ec7d3af

  Copy full SHA for ec7d3af