1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-01 16:51:16 +00:00

Merge branch 'release' into main

This commit is contained in:
Simon Frei 2020-10-06 13:06:40 +02:00
commit 6af2ab24cb
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 4246 versionCode 4247
versionName "1.10.0-rc.2" versionName "1.10.0"
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.10.0-rc.2 ( https://github.com/syncthing/syncthing/releases/tag/v1.10.0-rc.2 ) * Update Syncthing to v1.10.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.10.0 )

@ -1 +1 @@
Subproject commit 8210466b03a8dfc39413b948f3ea29cd1469d2eb Subproject commit aa65c6f2493751f342047ccce4e6c1ecf6913f04