|
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 |
|
|
c5be8a2114
|
day2_commit_11_MEGAFIX
|
2025-02-19 14:36:58 +03:00 |
|
|
4410d2970d
|
day2_commit.1.10_merged
|
2025-02-19 12:21:40 +03:00 |
|
|
ef8eb6b431
|
Merge branch 'Frontend_UI' into Frontend
|
2025-02-19 11:22:52 +03:00 |
|
|
102b9073c4
|
day2_commit_3_UI_fixed_gadle_and_CR
|
2025-02-19 10:55:39 +03:00 |
|
|
e710759066
|
day2_commit_1.1_xml_edited
|
2025-02-19 10:11:30 +03:00 |
|
|
68a936c899
|
day2_commit_1_fixed_gradle
|
2025-02-19 10:03:53 +03:00 |
|
|
5beb542341
|
aa
|
2025-02-18 18:44:09 +03:00 |
|