Commit Graph

1 Commits (6f070baa5a9052afc5f9abd9669af3f154b84d48)

Author SHA1 Message Date
haroon amjad 03c488c663 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart
2 years ago