EgorVorobev ee24f241db Merge branch 'Frontend' into Frontend_UI ...

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/ru/myitschool/work/ui/Main/AdminFragment.kt
#	app/src/main/res/layout/fragment_main.xml

2025-02-19 17:05:06 +03:00

..

src/main

Merge branch 'Frontend' into Frontend_UI

2025-02-19 17:05:06 +03:00

.gitignore

aa

2025-02-18 18:44:09 +03:00

build.gradle.kts

Merge branch 'Frontend' into Frontend_UI

2025-02-19 17:05:06 +03:00

proguard-rules.pro

aa

2025-02-18 18:44:09 +03:00