Commit Graph

1 Commits (f1b7b897cc7cfca0022c6f8139184eaa051e7ac1)

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