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

Merge branch 'release'

This commit is contained in:
Simon Frei 2021-09-07 18:16:05 +02:00
commit 53e782bd92
No known key found for this signature in database
GPG key ID: 7C31D23ECB1006F3
3 changed files with 4 additions and 4 deletions

View file

@ -41,8 +41,8 @@ android {
applicationId "com.nutomic.syncthingandroid" applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 29 targetSdkVersion 29
versionCode 4284 versionCode 4285
versionName "1.18.2-rc.2" versionName "1.18.2"
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.18.2-rc.2 ( https://github.com/syncthing/syncthing/releases/tag/v1.18.2-rc.2 ) * Update Syncthing to v1.18.2 ( https://github.com/syncthing/syncthing/releases/tag/v1.18.2 )

@ -1 +1 @@
Subproject commit a5bbb500e62c3742ef0860a9f21395575a1162b9 Subproject commit 5711bacd836d7fc6708cbd6e4343a9ddc14782a4