Mirza.Shafique@cloudsolutions.com.sa
|
501cd60814
|
Merge branch 'master' into mirza_dev
# Conflicts:
# android/build.gradle
# android/gradle/wrapper/gradle-wrapper.properties
# lib/config/provider_routes.dart
# lib/main.dart
# lib/repositories/branch_repo.dart
# lib/repositories/items_repo.dart
# lib/repositories/subscription_repo.dart
# lib/view_models/service_view_model.dart
# lib/views/dashboard/dashboard_page.dart
# lib/views/dashboard/fragments/home_fragment.dart
# lib/views/dashboard/fragments/request_list_fragment.dart
# lib/views/settings/branch/branch_detail_page.dart
# lib/views/settings/branch/define_branch_page.dart
# lib/views/settings/services/create_item_page.dart
# pubspec.lock
|
2 years ago |