student-24210/NTO-2025-Android-TeamTask-1
0
0
Fork 0
forked from student-18211/NTO-2025-Android-TeamTask
Code Pull Requests Activity
30 Commits 1 Branch 0 Tags
f632ddbe2bb3006053bafbd68a39f818ca16bfac
Commit Graph
4 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
student-15047 f632ddbe2b Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookIntent.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookState.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookViewModel.kt
#	app/src/main/res/values/strings.xml
 2025-12-05 18:31:20 +03:00
student-15047 f5ff5dbca8 I merge fork 2025-12-05 18:28:06 +03:00
student-15047 09e97f9d67 I configured the server connection and improved the logic 2025-12-04 23:19:42 +03:00
student-15047 2807368adb Added appearance and basic booking functionality 2025-11-30 17:52:39 +03:00