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.
PatientApp-KKUMC/android
haroon amjad e3b7069aa2 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
4 years ago
..
app Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
gradle/wrapper merge changes-5 4 years ago
.gitignore init project structure By Mohammad and Elham 5 years ago
CustomFlutterFirebaseMessagingService.java video call improvement. 4 years ago
build.gradle OpenTok SDK applied and method channels written to native 4 years ago
google-services.json merge changes-5 4 years ago
gradle.properties tamara. 4 years ago
settings.gradle init project structure By Mohammad and Elham 5 years ago
settings_aar.gradle login changes 5 years ago