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.

aamir-csol cf1908b44a Merge branch 'master' into dev_aamir ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart # lib/theme/colors.dart		2 months ago
..
core	Merge branch 'master' into dev_aamir	2 months ago
extensions	changes	2 months ago
features	Merge branch 'master' into dev_aamir	2 months ago
generated	Merge branch 'master' into dev_aamir	2 months ago
presentation	Merge branch 'master' into dev_aamir	2 months ago
routes	updating structure	2 months ago
services	completed the deviceapi with new architecture	2 months ago
theme	Merge branch 'master' into dev_aamir	2 months ago
widgets	Merge branch 'master' into dev_aamir	2 months ago
firebase_options.dart	initial commit	2 months ago
main.dart	prescription orders list page implemented	2 months ago
splashPage.dart	Landing page updates	2 months ago