Merge remote-tracking branch 'origin/master' into development

# Conflicts:
#	app/googlePlayFlavor/release/output-metadata.json
This commit is contained in:
Jens 2021-03-21 22:45:34 +01:00
commit 56806f0349
3 changed files with 4 additions and 3 deletions

View File

@ -10,8 +10,8 @@
{ {
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"versionCode": 100, "versionCode": 101,
"versionName": "1.6.24-googlePlay", "versionName": "1.6.25-googlePlay",
"outputFile": "app-googlePlayFlavor-release.apk" "outputFile": "app-googlePlayFlavor-release.apk"
} }
] ]

View File

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:4.1.2" classpath 'com.android.tools.build:gradle:4.1.3'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -0,0 +1 @@
Fixed bug that crashed the app when saving rules while the service was running.