|  haroon amjad | 05cf451181 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New # Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart | 1 month ago | 
				
					
						|  haroon amjad | 5de5fc8be9 | updates | 1 month ago | 
				
					
						|  Haroon6138 | 2ced674311 | Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master Reviewed-on: #40 | 1 month ago | 
				
					
						|  taha.alam | de6e0e3704 | data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo | 1 month ago | 
				
					
						|  aamir-csol | b9b0dfd1fa | Merge branch 'master' into dev_aamir # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart | 1 month ago | 
				
					
						|  aamir-csol | 15c07cb4e2 | otp screen & register Uae & resend Activation Code. | 1 month ago | 
				
					
						|  haroon amjad | 71a07eed8e | Merge branch 'master' into haroon_dev | 1 month ago | 
				
					
						|  taha.alam | ea2d2bf40f | retaining the old data. | 1 month ago | 
				
					
						|  taha.alam | 788887a7f1 | Merge remote-tracking branch 'origin/master' into feature/search_by_region # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart | 1 month ago | 
				
					
						|  taha.alam | 2174e0e292 | viewmodel and repo updated for the appointment by region selection. | 1 month ago | 
				
					
						|  taha.alam | 9c2dd721b4 | bottom sheets added of region facitlity and hospital. | 1 month ago | 
				
					
						|  haroon amjad | f9e7c8988a | updates | 2 months ago | 
				
					
						|  Sultan khan | 6b766e558d | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart | 2 months ago | 
				
					
						|  Sultan khan | 286dfaa376 | no message | 2 months ago | 
				
					
						|  aamir-csol | fbd6ef0cf8 | Merge branch 'master' into dev_aamir # Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart | 2 months ago | 
				
					
						|  aamir-csol | 4e17ff9c82 | otp screen & register Uae & resend Activation Code. | 2 months ago | 
				
					
						|  haroon amjad | 9f95150a94 | book appointment implementation completed. | 2 months ago | 
				
					
						|  Sultan khan | 009fa1859e | Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 2 months ago | 
				
					
						|  Sultan khan | fdd5d4cf6d | fixes | 2 months ago | 
				
					
						|  aamir-csol | 21a9cc8c89 | otp screen & register Uae & resend Activation Code. | 2 months ago | 
				
					
						|  Haroon Amjad | 2aa84e0334 | book appointment implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | 6f745f3666 | calendar implementation contd. | 2 months ago | 
				
					
						|  aamir-csol | 87830e17ab | otp screen | 2 months ago | 
				
					
						|  haroon amjad | 73f8baa77e | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart | 2 months ago | 
				
					
						|  Haroon6138 | f15018b0e8 | Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master Reviewed-on: #32 | 2 months ago | 
				
					
						|  haroon amjad | 7476c8e55a | book appo implementation contd. | 2 months ago | 
				
					
						|  aamir-csol | 6a09c2ec07 | validations & otp widget & focus & auto fill | 2 months ago | 
				
					
						|  Sikander Saleem | a25f42a43d | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	pubspec.yaml | 2 months ago | 
				
					
						|  Sikander Saleem | e17d207ce5 | swiper carousal view added in profile settings | 2 months ago | 
				
					
						|  haroon amjad | 3066bc8ea3 | Book appointment implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | 7b94199d58 | Medical report implementation done, Book Appointment implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | 14725616c6 | medical report implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | de717edfe8 | Sickleave implementation done. | 2 months ago | 
				
					
						|  Haroon Amjad | b240293064 | medical file implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | 1c39b26fcc | Merge branch 'master' into haroon_dev | 2 months ago | 
				
					
						|  haroon amjad | 151351c0bf | medical file updates | 2 months ago | 
				
					
						|  aamir-csol | 7c8d7b67a9 | signup finalize | 2 months ago | 
				
					
						|  aamir-csol | b7e19a0af8 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  aamir-csol | 0c58c22ea5 | sign | 2 months ago | 
				
					
						|  Haroon Amjad | 5620cc4442 | medical file implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | d87562caf5 | updates | 2 months ago | 
				
					
						|  haroon amjad | 3a649bca35 | Merge branch 'master' into haroon_dev | 2 months ago | 
				
					
						|  aamir-csol | 6f011880bd | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  haroon amjad | 9fbb8c3418 | updates | 2 months ago | 
				
					
						|  aamir-csol | 70810fa14c | signup completed | 2 months ago | 
				
					
						|  aamir-csol | 2b18e08e64 | signup completed | 2 months ago | 
				
					
						|  aamir-csol | 8c55064158 | signup completed | 2 months ago | 
				
					
						|  haroon amjad | 41ca0e27d9 | updates | 2 months ago | 
				
					
						|  haroon amjad | 1de551e799 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  haroon amjad | 28da6e0a2c | updates | 2 months ago | 
				
					
						|  Haroon6138 | 1df5b3abd9 | Merge pull request 'dev_sultan' (#26) from dev_sultan into master Reviewed-on: #26 | 2 months ago | 
				
					
						|  Sultan khan | 301348518d | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 2 months ago | 
				
					
						|  Sultan khan | a5f64798e0 | login fixes | 2 months ago | 
				
					
						|  Sikander Saleem | c6a5b49af8 | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  haroon amjad | f812dac059 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart | 2 months ago | 
				
					
						|  haroon amjad | 4269e99be9 | updates | 2 months ago | 
				
					
						|  Haroon6138 | 4cdcf495ea | Merge pull request 'dev_sultan' (#24) from dev_sultan into master Reviewed-on: #24 | 2 months ago | 
				
					
						|  Sikander Saleem | f9859036ef | ui improvements. | 2 months ago | 
				
					
						|  Sikander Saleem | 118c6717b1 | report and logout actions button added. | 2 months ago | 
				
					
						|  Sultan khan | 138862b115 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 2 months ago | 
				
					
						|  Sultan khan | 299c0b0e29 | login flow complete | 2 months ago | 
				
					
						|  haroon amjad | 8df38ea6d1 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/extensions/widget_extensions.dart | 2 months ago | 
				
					
						|  haroon amjad | 01b6ab0e4b | habib wallet implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | ccd29f0cf9 | updates | 2 months ago | 
				
					
						|  Sikander Saleem | 09e92b8649 | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | 50c3a8e595 | collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading | 2 months ago | 
				
					
						|  Sultan khan | 58d33e2dae | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart | 2 months ago | 
				
					
						|  Sultan khan | 1466b6b71a | no message | 2 months ago | 
				
					
						|  aamir-csol | 7dcc827721 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  aamir-csol | cd48d83c07 | signup | 2 months ago | 
				
					
						|  Haroon Amjad | 6b2ec5aa2c | updates, fixes & service privileges | 2 months ago | 
				
					
						|  Haroon Amjad | 255b3c1565 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  Haroon6138 | 0e76e95636 | Merge pull request 'dev_sultan' (#20) from dev_sultan into master Reviewed-on: #20 | 2 months ago | 
				
					
						|  Sultan khan | 2a081e30b5 | saved login done. | 2 months ago | 
				
					
						|  haroon amjad | b10523dac3 | Online CheckIn implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | 851bd569b4 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart | 2 months ago | 
				
					
						|  haroon amjad | e37eb78f81 | my appointments changes implementation contd. | 2 months ago | 
				
					
						|  Sultan khan | 9f0fb27baf | Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  aamir-csol | c129eb2c2f | Merge branch 'master' into dev_aamir | 2 months ago | 
				
					
						|  Sultan khan | b4667f5c94 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  aamir-csol | ffb399c704 | fixes for signup | 2 months ago | 
				
					
						|  Sultan khan | 075578602e | Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  Sultan khan | a199ca040b | quick login inprogress | 2 months ago | 
				
					
						|  aamir-csol | 9b063ba764 | fixes for signup | 2 months ago | 
				
					
						|  Sikander Saleem | 7cc12bd1cf | prescription calender reminder added. | 2 months ago | 
				
					
						|  Sikander Saleem | 60fe32131e | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | dfe02917fc | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | d464721733 | merge conflict fixed. | 2 months ago | 
				
					
						|  Haroon Amjad | f7d62ed2e8 | my appointments implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | 003a161b52 | custom chips implemented | 2 months ago | 
				
					
						|  haroon amjad | f8be788a60 | updates & fixes | 2 months ago | 
				
					
						|  Sikander Saleem | 0ce43fde5f | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart | 2 months ago | 
				
					
						|  Sikander Saleem | cb4601050c | prescription reminder bottom sheet added. | 2 months ago | 
				
					
						|  haroon amjad | 542de41a82 | updates & fixes | 2 months ago | 
				
					
						|  haroon amjad | 2d0fc11f05 | updates | 2 months ago | 
				
					
						|  aamir-csol | 3db3966c06 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/core/app_state.dart | 2 months ago | 
				
					
						|  aamir-csol | 484ab56a8e | fixes for signup | 2 months ago | 
				
					
						|  Sultan khan | 7d5b941df3 | merged conflict | 2 months ago | 
				
					
						|  Sultan khan | 384ac814f8 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart | 2 months ago | 
				
					
						|  Sultan khan | ba2c8327fe | login flow inprogress | 2 months ago | 
				
					
						|  haroon amjad | 2c45356b07 | Payment module implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | c27ba6ef09 | my appointments implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | a0bdc34685 | My appointments implementation contd. | 2 months ago | 
				
					
						|  Sultan khan | 61d10068ca | Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 2 months ago | 
				
					
						|  aamir-csol | 4e1912048d | login flow completion | 2 months ago | 
				
					
						|  aamir-csol | 52fddc5323 | login flow completion | 2 months ago | 
				
					
						|  Sultan khan | 7919d40f65 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/presentation/insurance/insurance_home_page.dart | 2 months ago | 
				
					
						|  Sultan khan | ac17202b7a | search lab order updated. | 2 months ago | 
				
					
						|  Haroon Amjad | 43fa08b8b6 | insurance update update | 2 months ago | 
				
					
						|  haroon amjad | d794787459 | updates | 2 months ago | 
				
					
						|  faizatflutter | b15ddd1713 | completed till otp receiving | 2 months ago | 
				
					
						|  faizatflutter | 36c41d40f8 | Merge branch 'master' into faiz_dev | 2 months ago | 
				
					
						|  haroon amjad | bafeb68950 | medical file changes | 2 months ago | 
				
					
						|  faizatflutter | 26f0ffda2c | completed till otp receiving | 2 months ago | 
				
					
						|  faizatflutter | 702c504d4e | Merge branch 'refs/heads/master' into faiz_dev1 # Conflicts:
#	pubspec.yaml | 2 months ago | 
				
					
						|  faizatflutter | db50bd8f23 | Merge branch 'master' into faiz_dev1 # Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart | 2 months ago | 
				
					
						|  haroon amjad | 2d5f2b1deb | updates | 2 months ago | 
				
					
						|  Sikander Saleem | 0db18c789c | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | d385d0362f | merge changes | 2 months ago | 
				
					
						|  faizatflutter | 923f7d7781 | completed till otp receiving | 2 months ago | 
				
					
						|  faizatflutter | 84804a59a7 | completed till otp receiving | 2 months ago | 
				
					
						|  Sultan khan | 3cafc16d50 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/presentation/lab/lab_orders_page.dart | 2 months ago | 
				
					
						|  Sikander Saleem | 6473ccecb5 | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	lib/core/app_assets.dart | 2 months ago | 
				
					
						|  Haroon6138 | 24b98626d2 | Merge pull request 'dev_aamir' (#8) from dev_aamir into master Reviewed-on: #8 | 2 months ago | 
				
					
						|  aamir-csol | c27d7301d9 | calender & signup fixes. | 2 months ago | 
				
					
						|  Sultan khan | 29aae34726 | lab search added | 2 months ago | 
				
					
						|  haroon amjad | 2f9fbaef7a | insurance update implementation contd. | 2 months ago | 
				
					
						|  aamir-csol | da035650c0 | Merge branch 'master' into dev_aamir # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart | 2 months ago | 
				
					
						|  aamir-csol | 3855ba276f | calender & signup fixes. | 2 months ago | 
				
					
						|  haroon amjad | 333b813f90 | bottom sheet fixes | 2 months ago | 
				
					
						|  haroon amjad | cce7c7166d | Merge branch 'dev_sultan' # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart | 2 months ago | 
				
					
						|  haroon amjad | e8cc6407b6 | Insurance update implementation contd. | 2 months ago | 
				
					
						|  Sultan khan | 2f2a8f3f8f | search lab result screen added | 2 months ago | 
				
					
						|  Sikander Saleem | ac0b7bec44 | custom tab bar added in medical file section. | 2 months ago | 
				
					
						|  Sikander Saleem | 85bb00a8fc | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | 38d37fd407 | custom tab bar added. | 2 months ago | 
				
					
						|  haroon amjad | efb22aec4e | prescription details page implemented | 2 months ago | 
				
					
						|  aamir-csol | e41ffd583d | changes | 2 months ago | 
				
					
						|  faizatflutter | 3e50a3c89d | Merge branch 'dev_aamir' into faiz_dev1 # Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart | 2 months ago | 
				
					
						|  aamir-csol | 0309299f44 | changes | 2 months ago | 
				
					
						|  faizatflutter | 6e05ca15cf | adding the login function | 2 months ago | 
				
					
						|  Haroon Amjad | e8f8f6074c | prescription details updates | 2 months ago | 
				
					
						|  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 | 
				
					
						|  aamir-csol | 85fac13314 | changes | 2 months ago | 
				
					
						|  Haroon Amjad | cd61d08d49 | Merge branch 'dev_sultan' | 2 months ago | 
				
					
						|  haroon amjad | 712e11c69a | prescription details page implementation contd. | 2 months ago | 
				
					
						|  Sultan khan | 886825a4b9 | bottom navigation updated. | 2 months ago | 
				
					
						|  faizatflutter | 32fadb8ad9 | completed login function | 2 months ago | 
				
					
						|  haroon amjad | 8bc49929d4 | prescription orders list page implemented | 2 months ago | 
				
					
						|  haroon amjad | 6f07bc7c2c | Radiology Orders implemented | 2 months ago | 
				
					
						|  haroon amjad | 4c241b0dac | Lab orders implemented | 2 months ago | 
				
					
						|  Sultan khan | 0de09dd72c | no message | 2 months ago | 
				
					
						|  Sultan khan | 39c284d036 | Merge remote-tracking branch 'origin/master' into dev_sultan # Conflicts:
#	lib/presentation/home/landing_page.dart | 2 months ago | 
				
					
						|  Sultan khan | f55d82ddb3 | bottom navigation | 2 months ago | 
				
					
						|  Haroon Amjad | 36c6f0d541 | Landing page updates | 2 months ago | 
				
					
						|  Haroon Amjad | 2b22e17743 | android fixes | 2 months ago | 
				
					
						|  aamir-csol | 7321da67e3 | register step 2 & fixes | 2 months ago | 
				
					
						|  aamir-csol | ed24365eff | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart | 2 months ago | 
				
					
						|  Haroon Amjad | f5e655fd35 | Lab order API implemented | 2 months ago | 
				
					
						|  Haroon Amjad | a77fc49c68 | lab result changes | 2 months ago | 
				
					
						|  haroon amjad | e044fc8c5e | lab implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | 89456bc2aa | Medical File Insurance tab content done | 2 months ago | 
				
					
						|  faizatflutter | 488636a13f | Merge branch 'dev_aamir' into faiz_dev1 # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  faizatflutter | a0e5aeda05 | Merge branch 'master' into faiz_dev1 | 2 months ago | 
				
					
						|  faizatflutter | 572fcef0f1 | checkUserAuth | 2 months ago | 
				
					
						|  aamir-csol | d1e1154bdb | changes | 2 months ago | 
				
					
						|  aamir-csol | 23a4035117 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart | 2 months ago | 
				
					
						|  aamir-csol | 67e580447e | changes | 2 months ago | 
				
					
						|  haroon amjad | 9b1c3fe920 | medical file updates | 2 months ago | 
				
					
						|  faizatflutter | c6a95fe7d7 | latest push after master merged | 2 months ago | 
				
					
						|  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 | 
				
					
						|  aamir-csol | 8f1e4500cc | register & Exception bottom sheet, country dropdown. | 2 months ago | 
				
					
						|  aamir-csol | 5e292544d7 | Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir # Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart | 2 months ago | 
				
					
						|  faizatflutter | 89e9323d9e | merged master and updated structure | 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 | 
				
					
						|  faizatflutter | c1221e4970 | pushed device api | 2 months ago | 
				
					
						|  aamir-csol | 6f98690929 | register & changes | 2 months ago | 
				
					
						|  Sultan khan | 4e010bb2cf | initial commit | 2 months ago | 
				
					
						|  aamir-csol | 9c52a6122f | Merge branch 'master' into dev_aamir # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/authantication/login.dart | 2 months ago | 
				
					
						|  aamir-csol | a4da9db6c3 | register & changes | 2 months ago | 
				
					
						|  Haroon Amjad | 0a39a00df5 | Landing page updates | 2 months ago | 
				
					
						|  Sultan khan | d3aff9f93d | updating structure | 2 months ago | 
				
					
						|  aamir-csol | 8ed8637108 | Merge branch 'refs/heads/master' into dev_aamir # Conflicts:
#	lib/presentation/authantication/login.dart | 2 months ago | 
				
					
						|  aamir-csol | ea15bd9152 | bottom sheet | 2 months ago | 
				
					
						|  Haroon Amjad | 30fd99d122 | android fixes | 2 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 | 2 months ago | 
				
					
						|  faizatflutter | 45e868adba | pushed new API | 2 months ago | 
				
					
						|  aamir-csol | 4d76b34608 | app bar & chip | 2 months ago | 
				
					
						|  Faiz Hashmi | 357cf4392e | Updated architecture | 2 months ago | 
				
					
						|  aamir-csol | 255d189ce1 | widgets & fixes | 2 months ago | 
				
					
						|  aamir-csol | 4e3ba99280 | widgets & fixes | 2 months ago | 
				
					
						|  Faiz Hashmi | d65dc4ea89 | initial commit | 2 months ago | 
				
					
						|  Haroon Amjad | 4fcaea2993 | updates | 2 months ago | 
				
					
						|  Haroon Amjad | c65d44ae4d | updates | 2 months ago | 
				
					
						|  Haroon Amjad | 2293db00ea | updates | 2 months ago | 
				
					
						|  Haroon Amjad | b6766654e0 | initial commit | 2 months ago |