Commit Graph

2 Commits (57ebe40b5d1116d001f299cf7ff1c0ba41f06ddf)

Author SHA1 Message Date
haroon amjad 1719c7029e Merge branch 'master' into development_haroon
# Conflicts:
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	pubspec.yaml
4 years ago
haroon amjad c63844dcf7 My requests & CCP 4 years ago