2 Commits (2f301da9b94ed69599c90da0885a5622af2e663b)

Author	SHA1	Message	Date
Sultan khan	f21348d9b7	Merge branch 'development_haroon_merge_aamir' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev ... # Conflicts: # android/gradle/wrapper/gradle-wrapper.properties # lib/api/chat/chat_api_client.dart # lib/classes/consts.dart # lib/generated_plugin_registrant.dart # lib/main.dart # lib/provider/chat_provider_model.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart # pubspec.yaml	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