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

..

src

Merge remote-tracking branch 'origin/main' into a10

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

.gitignore

first commit

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

build.gradle.kts

Merge remote-tracking branch 'origin/main' into a10

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

google-services.json

Bug Fixing, Firebase Analytics

2025-04-05 02:40:49 +07:00

proguard-rules.pro

move byedpi classes to package org.cherret.zaprett.byedpi

2025-07-04 14:04:48 +03:00