2 Commits (4baf5f9389465aea2962a670401c9f7e1f5e9d19)

Author	SHA1	Message	Date
haroon amjad	a05d037211	Merge branch 'master' into development_haroon ... # Conflicts: # lib/classes/colors.dart # lib/extensions/string_extensions.dart # lib/ui/screens/announcements/announcement_details.dart # lib/ui/screens/announcements/announcements.dart # lib/ui/screens/mowadhafhi/mowadhafhi_home.dart # lib/widgets/dynamic_forms/dynamic_textfield_widget.dart	4 years ago
haroon amjad	c63844dcf7	My requests & CCP	4 years ago