2 Commits (d99bc6e206852e05936ba27b6497fc85b34fe958)

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	3 years ago
haroon amjad	028caf1379	Offers & Discounts implemented	3 years ago