Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # lib/view/pages/timetable/appointmentDetails.dart
This commit is contained in:
commit
83b0cc18be
# Conflicts: # lib/view/pages/timetable/appointmentDetails.dart