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.

Sultan khan b2ffa0c619 Merge branch 'master' into mohem_flutter_upgrade ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/app_state/app_state.dart # lib/classes/consts.dart # lib/dialogs/otp_dialog.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/theme/app_theme.dart # lib/ui/attendance/monthly_attendance_screen.dart # lib/ui/chat/chat_home_screen.dart # lib/ui/login/verify_last_login_screen.dart # lib/ui/login/verify_login_screen.dart # lib/ui/my_team/view_attendance.dart # lib/ui/profile/delete_family_member.dart # lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart # lib/ui/work_list/worklist_detail_screen.dart # lib/ui/work_list/worklist_fragments/info_fragments.dart # lib/widgets/app_bar_widget.dart # lib/widgets/image_picker.dart # lib/widgets/nfc/nfc_reader_sheet.dart # pubspec.yaml		4 months ago
..
otp_dialog.dart	Merge branch 'master' into mohem_flutter_upgrade	4 months ago