development_haroon #5

Merged
Haroon6138 merged 13 commits from development_haroon into master 2 years ago

13 Commits (master)

Author SHA1 Message Date
haroon amjad 281f0bab78 updates 2 years ago
haroon amjad ed9705f18f fixes 2 years ago
haroon amjad a58d4753e4 Merge branch 'sultan-dev' into development_haroon
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
2 years ago
haroon amjad a48d703642 ITG ADs update 2 years ago
Sultan khan 333dba3777 business mission issue fixed. 2 years ago
haroon amjad 5098aa7f90 my docs upload fix 2 years ago
haroon amjad 0fd1c8c96b Merge branch 'master' into development_haroon 2 years ago
haroon amjad e39526b5eb Updates & fixes 2 years ago
Sultan khan 608a8fcb97 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
2 years ago
Sultan khan aca223c700 business trip fixed 2 years ago
Sultan khan 790103bdc9 chat changes 2 years ago
Sultan khan fd6058e87d Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart
3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago