You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mohemm-flutter-app/lib
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
..
api Merge branch 'master' into development_haroon 3 years ago
app_state Worklist & Wifi attendance 4 years ago
classes Merge branch 'master' into development_haroon 3 years ago
config Merge branch 'master' into development_haroon 3 years ago
dialogs lint rules added. 4 years ago
exceptions
extensions Merge branch 'master' into development_haroon 3 years ago
generated Vacation rule translation added. 3 years ago
models Merge branch 'master' into development_haroon 3 years ago
provider offers & discounts implemented 3 years ago
theme lint rules added. 4 years ago
ui Merge branch 'master' into development_haroon 3 years ago
widgets Merge branch 'master' into development_haroon 3 years ago
main.dart configs for ios. 3 years ago