You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_QLine/lib
Faiz Hashmi 726bef8562 Merge branch 'qline_android14_fixes' into master_clone
# Conflicts:
#	android/app/src/main/kotlin/com/example/hmg_qline/hmg_qline/MainActivity.kt
#	lib/constants/app_constants.dart
#	lib/main.dart
#	lib/models/global_config_model.dart
#	lib/view_models/screen_config_view_model.dart
#	lib/views/main_queue_screen/components/priority_tickets.dart
#	lib/views/main_queue_screen/components/priority_tickets_sidelist.dart
#	lib/views/main_queue_screen/main_queue_screen.dart
2 months ago
..
api Merge branch 'qline_android14_fixes' into master_clone 2 months ago
config Improved Logging 6 months ago
constants Merge branch 'qline_android14_fixes' into master_clone 2 months ago
models Merge branch 'qline_android14_fixes' into master_clone 2 months ago
repositories Merge branch 'qline_android14_fixes' into master_clone 2 months ago
services android 14 testing started. 5 months ago
utilities Merge branch 'qline_android14_fixes' into master_clone 2 months ago
view_models Merge branch 'qline_android14_fixes' into master_clone 2 months ago
views Merge branch 'qline_android14_fixes' into master_clone 2 months ago
main.dart Merge branch 'qline_android14_fixes' into master_clone 2 months ago