Merge remote-tracking branch 'refs/remotes/origin/main' into database… · bitwarden/authenticator-android@0067f09 · GitHub

Commit

Merge remote-tracking branch 'refs/remotes/origin/main' into database…

Browse files

…-read-write-ui

# Conflicts:
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/item/ItemViewModel.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensions.kt

Loading branch information

SaintPatrck committed Apr 5, 2024

2 parents 43801d1 + 50530b5 commit 0067f09