1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 03:11:30 +00:00

Merge branch 'release'

This commit is contained in:
Simon Frei 2020-07-21 13:39:19 +02:00
commit 637f591db3
3 changed files with 4 additions and 4 deletions

View file

@ -37,8 +37,8 @@ android {
applicationId "com.nutomic.syncthingandroid" applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
versionCode 4237 versionCode 4238
versionName "1.7.0" versionName "1.7.1"
testApplicationId 'com.nutomic.syncthingandroid.test' testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }

View file

@ -1 +1 @@
* Update Syncthing to v1.7.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.7.0 ) * Update Syncthing to v1.7.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.7.1 )

@ -1 +1 @@
Subproject commit 5f40879a75b7e3b94f814b68f55fe2038bfecdd4 Subproject commit d57694dc042ee24d7f76a3ed9743ea02f01e456d