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.
Sikander Saleem 6ef6bc40a0 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/dashboard_latest/widgets/request_category_list.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
11 months ago
..
action_button
…
bottom_sheets
…
activities_list_view.dart
…
activity_card_view.dart
…
asset_detail_card.dart
…
history_log_view.dart
…
initial_visit_card.dart
…
scan_qr_view.dart
…
service_request_detail_view.dart Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 11 months ago
timer_widget.dart
…
verify_arrival_view.dart
…
verify_otp_view.dart
…
weekly_calendar_fragment.dart
…
work_order_card_view.dart
…