Terebov_Maksim 537daa1072 Merge remote-tracking branch 'origin/Frontend' into Frontend ...

# Conflicts:
#	app/src/main/java/ru/myitschool/work/api/ApiService.kt
#	app/src/main/java/ru/myitschool/work/ui/Main/MainFragment.kt
#	app/src/main/java/ru/myitschool/work/ui/qr/result/QrResult.kt

2025-02-20 16:42:46 +03:00

..

src/main

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

2025-02-20 16:42:46 +03:00

.gitignore

aa

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

build.gradle.kts

day2_commit_1_xml_з123123213

2025-02-19 18:59:50 +03:00

proguard-rules.pro

aa

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