Commit Graph

4 Commits (a58d4753e495b51e9dc9a25d9e2ce5718cde4dde)

Author SHA1 Message Date
Fatimah Alshammari bee1aef03e Merge branch 'master' into Fatima
# Conflicts:
#	lib/models/get_user_item_type_list.dart
#	lib/models/my_team/get_attendance_tracking_list_model.dart
#	lib/models/my_team/get_employee_subordinates_list.dart
#	lib/models/update_item_type_success_list.dart
#	lib/models/update_user_item_type_list.dart
#	lib/models/worklist/update_user_type_list.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/contact_details.dart
3 years ago
Fatimah Alshammari d640ce29de fix issue 3 years ago
Sikander Saleem 41a1ba125e code improvements. 3 years ago
Fatimah Alshammari a22f679908 my team module and workList settings 4 years ago