Merge branch 'master' into fatima
# Conflicts:
# lib/api/user_api_client.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/models/user/change_email.dart
# lib/models/user/change_mobile.dart
# lib/models/user/change_password.dart
# lib/models/user/confirm_email.dart
# lib/models/user/confirm_mobile.dart
# lib/pages/dashboard/dashboard_page.dart
# lib/pages/user/change_email_page.dart
# lib/pages/user/change_mobile_page.dart
# lib/pages/user/change_password_page.dart
# lib/pages/user/complete_profile_page.dart
# lib/pages/user/confirm_new_password.dart
# lib/pages/user/edit_account_page.dart
# lib/pages/user/forget_password_method_page.dart
# lib/pages/user/forget_password_page.dart
# lib/pages/user/login_with_password_page.dart
# pubspec.lock
|