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

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

View File

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