Merge remote-tracking branch 'origin/Frontend' into Frontend

Browse Source

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/ru/myitschool/work/api/ApiModule.kt
#	app/src/main/java/ru/myitschool/work/api/ApiService.kt
#	app/src/main/java/ru/myitschool/work/core/Constants.kt
#	app/src/main/java/ru/myitschool/work/ui/Main/AdminFragment.kt
#	app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt

...

This commit is contained in:

Terebov_Maksim 2025-02-20 10:30:48 +03:00

parent c510b6d1fb a926e0f57c

commit bddcda4b72

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available