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.
cloudsolutions-atoms/lib/modules
Sikander Saleem 9eaae96c84 Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
2 days ago
..
asset_delivery_module Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas 2 days ago
asset_inventory_module Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 2 months ago
cm_module Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module 2 days ago
cx_module merge conflict resolved. 2 days ago
demo_module api integrate cont. 1 week ago
internal_audit_module Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_medical_gas_inspection 1 month ago
loan_module improvements 3 weeks ago
medical_gas_inspection Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module 2 days ago
pm_module asset delivery modules completed 1 month ago
tm_module Merge branch 'design_3.0_cx_module' into design_3.0_loan_module 2 days ago
traf_module files refactoring 2 months ago