mirror of
https://github.com/twofas/2fas-android.git
synced 2024-11-22 18:29:52 +01:00
3009287178
# 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 |
||
---|---|---|
.. | ||
about | ||
appsettings | ||
browserext | ||
externalimport | ||
home | ||
startup | ||
trash |