Commit Graph

1 Commits (9602e95fe7b5161a7bd98c06c81a22589bf31b87)

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