Corona-Warn-App/build.gradle · b769a0ab826f27a04d6f5cda4be5307661d5441e · Felix Foertsch / Cwa App Android

4 years ago

Merge branch 'dev' into fix/staging_dev_conflicts · de7ed281

# Conflicts:
#	Corona-Warn-App/build.gradle
#	Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
#	Corona-Warn-App/src/main/res/values-en/strings.xml
#	Corona-Warn-App/src/main/res/values-tr/strings.xml

de7ed281

History

Merge branch 'dev' into fix/staging_dev_conflicts

Philipp Woessner authored 4 years ago

# Conflicts:
#	Corona-Warn-App/build.gradle
#	Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
#	Corona-Warn-App/src/main/res/values-en/strings.xml
#	Corona-Warn-App/src/main/res/values-tr/strings.xml

Code owners

Assign users and groups as approvers for specific file changes. Learn more.

build.gradle 12.03 KiB