Zyzf f79fd6d658 Merge remote-tracking branch 'origin/5lab' into 5lab ... # Conflicts: # app/src/main/java/com/zyzf/coffeepreorder/ui/coffee/CoffeeList.kt		2023-12-20 14:19:40 +04:00
.idea	fixes	2023-12-20 14:18:34 +04:00
app	fixes	2023-12-20 14:18:34 +04:00
backend	fixes	2023-12-20 14:18:34 +04:00
gradle/wrapper	many done	2023-12-14 22:14:12 +04:00
Отчеты	fixed reports	2023-12-20 14:18:37 +04:00
.gitignore	copied spring project	2023-12-12 16:09:47 +04:00
build.gradle.kts	many done	2023-12-14 22:14:12 +04:00
gradle.properties	Some done and init	2023-10-15 20:54:08 +04:00
gradlew	Some done and init	2023-10-15 20:54:08 +04:00
gradlew.bat	Some done and init	2023-10-15 20:54:08 +04:00
settings.gradle.kts	fixed some warnings	2023-11-16 20:52:35 +04:00