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.

Sikander Saleem 95e2e74fd0 Merge branch 'master' into development_sikander ... # Conflicts: # android/app/src/main/AndroidManifest.xml # assets/langs/en-US.json # lib/config/routes.dart # lib/extensions/string_extensions.dart # lib/generated/codegen_loader.g.dart # lib/main.dart # lib/models/generic_response_model.dart # lib/ui/my_attendance/my_attendance_screen.dart # lib/ui/work_list/worklist_detail_screen.dart		3 years ago
..
widget	Merge branch 'master' into development_sikander	3 years ago
dashboard.dart	Merge branch 'master' into development_mirza	3 years ago
dashboard_screen.dart	profile details	3 years ago
today_attendance_screen.dart	Worklist & Wifi attendance	3 years ago