Commit Graph

10 Commits (e044fc8c5e1746ccd3e88fac881de26112de3ebb)

Author SHA1 Message Date
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
2 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 2 months ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
2 months ago
Sultan khan d3aff9f93d updating structure 2 months ago
Haroon Amjad 30fd99d122 android fixes 2 months ago
aamir-csol 4e3ba99280 widgets & fixes 2 months ago
Haroon Amjad c65d44ae4d updates 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago