Commit Graph

7 Commits (a928a6f6c5e90dac4839d33d9b68e69779944ccd)

Author SHA1 Message Date
Haroon Amjad a532d3ab53 Merge branch 'haroon_dev' into Main_App_Replacement
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/splashPage.dart
3 weeks ago
haroon amjad aa79e46176 updates 3 weeks ago
Haroon Amjad 43177680fd updates 4 weeks ago
taha 532c894e16 huawei watch addded 3 months ago
haroon amjad c12c90651e 16 KB page alignment updates 6 months ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 8 months ago
aamir-csol 59054df238 android / ios folder push 1 year ago