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.
diplomatic-quarter/android
haroon amjad dbfe9663a5 Merge branch 'dev_v3.13.6' into dev_v3.13.6_CR_7211_Lab_report_changes
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	pubspec.yaml
8 months ago
..
app Merge branch 'dev_v3.13.6' into dev_v3.13.6_CR_7211_Lab_report_changes 8 months ago
gradle/wrapper
.gitignore
CustomFlutterFirebaseMessagingService.java
FlutterFirebaseMessagingReceiver.java
build.gradle Merge branch 'dev_v3.13.6' into dev_v3.13.6_CR_7211_Lab_report_changes 8 months ago
google-services.json
gradle.properties
settings.gradle
settings_aar.gradle