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
..
fonts	Gradle updated, fonts added & structure improvements	4 years ago
icons	NFC Attendance implement	4 years ago
images	Dashboard API's 1.1	4 years ago
langs	Merge branch 'master' into Fatima	4 years ago