Skip to content

Commit

Permalink
Merge branch 'release/candidate' of https://github.com/wireapp/kalium
Browse files Browse the repository at this point in the history
…into feat/e2ei/uprade-cc-rc33

# Conflicts:
#	cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/E2EIClientImpl.kt
#	cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/E2EIClient.kt
#	gradle/libs.versions.toml
#	logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepository.kt
#	logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/EnrollE2EIUseCase.kt
#	logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
#	logic/src/commonTest/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepositoryTest.kt
#	logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/EnrollE2EICertificateUseCaseTest.kt
  • Loading branch information
mchenani committed Jan 26, 2024
2 parents a63d6b9 + 06b6882 commit 60f68e2
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 60f68e2

Please sign in to comment.