Commit Graph

7 Commits (1fd69dc2e481bbec75843f702fb426e1a8ca287a)

Author SHA1 Message Date
Aamir d4ebcf998f changes 1 year ago
Aamir 1b37692dd7 Merge branch 'faiz_development_common' into master_new_changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/utils/location/Location.dart
#	lib/view_models/service_view_model.dart
#	lib/view_models/subscriptions_view_model.dart
#	lib/views/location_views/map_selection_widget.dart
#	lib/views/location_views/pick_location_page.dart
#	lib/views/setting_options/provider_license_page.dart
1 year ago
Aamir 73080483fc changes 1 year ago
Faiz Hashmi ee4e7a7c2b Bug Fixed 1 year ago
Faiz Hashmi 6e74801852 Added Settings Modules 1 year ago
Faiz Hashmi 450dfff6e8 Added Shipping Management 1 year ago
Faiz Hashmi fc2b400845 added notifications 1 year ago