Commit Graph

1 Commits (1a3bf90b890e3ddcb190a3582018b2b50f807c2e)

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