Milan Cerovsky b46b7f6ac4 Merge branch 'refs/heads/main' into issue-1420 ... # Conflicts: # app/src/main/java/co/electriccoin/zcash/app/ZcashApplication.kt # configuration-impl-android-lib/src/main/java/co/electriccoin/zcash/configuration/AndroidConfigurationFactory.kt # preference-impl-android-lib/src/main/java/co/electriccoin/zcash/preference/AndroidPreferenceProvider.kt # ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/support/model/SupportInfoTest.kt # ui-lib/src/main/java/co/electriccoin/zcash/di/KoinActivityViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/global/WalletCoordinator.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/repository/WalletRepository.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/viewmodel/AuthenticationViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/viewmodel/HomeViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/viewmodel/WalletViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/chooseserver/AndroidChooseServer.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restoresuccess/viewmodel/RestoreSuccessViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/viewmodel/SettingsViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/model/SupportInfo.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/viewmodel/SupportViewModel.kt		2024-09-04 15:56:43 +02:00
..
src	Merge branch 'refs/heads/main' into issue-1420	2024-09-04 15:56:43 +02:00
build.gradle.kts	[#1557] Release 1.1.6 (712)	2024-09-04 13:29:41 +02:00
proguard-project.txt	#96 Release build R8 warnings (#1482)	2024-06-24 10:19:00 +02:00