Commit Graph

5 Commits (ea25ce56a5a72f59cd346013d9f100e896ba19cb)

Author SHA1 Message Date
haroon amjad cd399a032c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/ar-SA.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/dialogs/id/business_card_dialog.dart
1 day ago
Sultan khan bd6e9577e3 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Toast fixed

# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad d3c5fd1467 Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
4 years ago
haroon amjad 6436062642 HMG Mohemm Setup 4 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 4 years ago