Commit Graph

2 Commits (a64ae80a4ae76f8b4d48b47e828c765c0eaf0d7e)

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
3 years ago
haroon amjad c63844dcf7 My requests & CCP 3 years ago