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.

Fatimah Alshammari 0e560558dc Merge branch 'master' into Fatima ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/config/routes.dart # lib/extensions/string_extensions.dart # lib/extensions/widget_extensions.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/ui/landing/dashboard.dart # pubspec.lock # pubspec.yaml		4 years ago
..
api	merge improvements	4 years ago
app_state	merge improvements	4 years ago
classes	Merge branch 'master' into Fatima	4 years ago
config	Merge branch 'master' into Fatima	4 years ago
dialogs	NFC Attendance implement 1.4	4 years ago
exceptions	confirm login screen added & structure improvement.	4 years ago
extensions	Merge branch 'master' into Fatima	4 years ago
generated	fix	4 years ago
models	item creation added.	4 years ago
provider	merge improvements	4 years ago
theme	api structure improvement.	4 years ago
ui	Merge branch 'master' into Fatima	4 years ago
widgets	Merge branch 'development_mirza' into development_sikander	4 years ago
main.dart	NFC Attendance implement	4 years ago