Rafał Kobyłko 3009287178 Merge branch 'develop' into feature/material3 ... # Conflicts: # app/src/main/java/com/twofasapp/features/main/MainServicesActivity.kt # browserextension/src/main/java/com/twofasapp/browserextension/ui/main/BrowserExtensionScreen.kt # core/locale/src/main/res/values/strings.xml # externalimport/src/main/java/com/twofasapp/externalimport/ui/aegis/AegisScreen.kt # externalimport/src/main/java/com/twofasapp/externalimport/ui/raivo/RaivoScreen.kt # feature/externalimport/src/main/java/com/twofasapp/feature/externalimport/ui/googleauthenticator/GoogleAuthenticatorScreen.kt # feature/externalimport/src/main/java/com/twofasapp/feature/externalimport/ui/result/ImportResultScreen.kt # feature/externalimport/src/main/java/com/twofasapp/feature/externalimport/ui/result/ImportResultViewModel.kt # feature/externalimport/src/main/java/com/twofasapp/feature/externalimport/ui/scan/ImportScanScreen.kt # notifications/src/main/java/com/twofasapp/notifications/ui/NotificationsActivity.kt # security/src/main/java/com/twofasapp/security/ui/security/SecurityScreen.kt # security/src/main/java/com/twofasapp/security/ui/setuppin/SetupPinScreen.kt # time/build.gradle.kts		2023-02-11 19:18:20 +01:00
..
src/main/java/com/twofasapp/buildlogic	Merge branch 'develop' into feature/material3	2023-02-11 19:18:20 +01:00
.gitignore
build.gradle.kts	Service list item	2023-02-11 18:23:29 +01:00
settings.gradle.kts