faiz_dev1 #3

Merged
Haroon6138 merged 13 commits from faiz_dev1 into master 10 months ago

13 Commits (main)

Author SHA1 Message Date
faizatflutter c6a95fe7d7 latest push after master merged 10 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
10 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 10 months ago
faizatflutter 89e9323d9e merged master and updated structure 10 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
10 months ago
faizatflutter c1221e4970 pushed device api 10 months ago
Sultan khan 4e010bb2cf initial commit 10 months ago
Sultan khan d3aff9f93d updating structure 10 months ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
10 months ago
faizatflutter 45e868adba pushed new API 10 months ago
Faiz Hashmi 357cf4392e Updated architecture 10 months ago
Faiz Hashmi d65dc4ea89 initial commit 10 months ago