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
Aamir Muhammad 2f22519d86 Merge remote-tracking branch 'origin/sultan-dev' into development_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/api/chat/chat_api_client.dart
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated_plugin_registrant.dart
#	lib/main.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/chat/group_chat_detaied_screen.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	lib/widgets/image_picker.dart
#	pubspec.yaml
2 years ago
..
api Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
app_state Merge branch 'master' into development_aamir 2 years ago
classes Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
config Merge branch 'development_haroon_merge_aamir' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 2 years ago
dialogs Huawei push implementation 3 years ago
exceptions confirm login screen added & structure improvement. 4 years ago
extensions added the text intimation to join the marathon 2 years ago
generated added the text intimation to join the marathon 2 years ago
models Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
provider Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
theme voip merge conflicts resolve 2 years ago
ui Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
widgets Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
generated_plugin_registrant.dart Voip Call 2 years ago
main.dart Merge remote-tracking branch 'origin/sultan-dev' into development_aamir 2 years ago
start_term_approval_process_list_model.dart end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 3 years ago