Commit Graph

62 Commits (8c956fc052f5a1874e4479bb79de02d465a1bdad)

Author SHA1 Message Date
Sikander Saleem d385d0362f merge changes 2 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
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
haroon amjad e8cc6407b6 Insurance update implementation contd. 2 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 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 e044fc8c5e lab implementation contd. 2 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 2 months ago
aamir-csol d1e1154bdb changes 2 months ago
haroon amjad 9b1c3fe920 medical file updates 2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago