egor-white 4737e763ea Merge remote-tracking branch 'origin/main' into a10 ...

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/com/cherret/zaprett/MainActivity.kt
#	app/src/main/java/com/cherret/zaprett/ui/viewmodel/BaseListsViewModel.kt
#	app/src/main/java/com/cherret/zaprett/ui/viewmodel/HomeViewModel.kt
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values/strings.xml
#	gradle/libs.versions.toml

2025-07-08 14:39:23 +03:00

..

codeStyles

non root and etc

2025-06-30 00:42:04 +07:00

inspectionProfiles

first commit

2025-03-25 12:21:23 +07:00

.gitignore

first commit

2025-03-25 12:21:23 +07:00

AndroidProjectSystem.xml

first commit

2025-03-25 12:21:23 +07:00

appInsightsSettings.xml

non root and etc

2025-06-30 00:42:04 +07:00

compiler.xml

first commit

2025-03-25 12:21:23 +07:00

deploymentTargetSelector.xml

add icon and module info card

2025-07-03 21:00:45 +03:00

gradle.xml

Android 10 fix & update libs

2025-06-27 20:19:48 +03:00

kotlinc.xml

first commit

2025-03-25 12:21:23 +07:00

migrations.xml

first commit

2025-03-25 12:21:23 +07:00

misc.xml

add icon and module info card

2025-07-03 21:00:45 +03:00

runConfigurations.xml

first commit

2025-03-25 12:21:23 +07:00

vcs.xml

non root and etc

2025-06-30 00:42:04 +07:00