Merge branch 'master' into v2.4

This commit is contained in:
Mygod
2019-04-14 13:00:34 +08:00

View File

@@ -42,7 +42,7 @@ android {
} }
dataBinding.enabled = true dataBinding.enabled = true
flavorDimensions("freedom") flavorDimensions("freedom")
packagingOptions.exclude 'META-INF/*.kotlin_module' packagingOptions.exclude '**/*.kotlin_*'
productFlavors { productFlavors {
fdroid { fdroid {
dimension "freedom" dimension "freedom"