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.
mohemm-flutter-app/lib/ui/mazaya
haroon amjad 38906e24b7 Merge branch 'master' into wala_plus_with_dialog_removal
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Flutter/AppFrameworkInfo.plist
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/Info.plist
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/models/get_mobile_login_info_list_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	pubspec.yaml
2 days ago
..
widgets ui updates 2 days ago
mazaya_discover_screen.dart ui updates 2 days ago
retailer_details_screen.dart Merge branch 'master' into wala_plus_with_dialog_removal 2 days ago
retailers_list_screen.dart ui updates 2 days ago
saved_retailers_screen.dart ui updates 2 days ago