1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-09 11:41:29 +00:00

Merge branch 'release'

This commit is contained in:
Simon Frei 2022-09-06 22:50:15 +02:00
commit a7b26751e9
No known key found for this signature in database
GPG key ID: 7C31D23ECB1006F3
3 changed files with 4 additions and 4 deletions

View file

@ -42,8 +42,8 @@ android {
applicationId "com.nutomic.syncthingandroid" applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 30
versionCode 4317 versionCode 4319
versionName "1.21.0-rc.1" versionName "1.21.0"
testApplicationId 'com.nutomic.syncthingandroid.test' testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }

View file

@ -1,2 +1,2 @@
* Update Syncthing to v1.21.0-rc.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.21.0-rc.1 ) * Update Syncthing to v1.21.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.21.0 )
* Unreliable charging detection ( #1595 ) * Unreliable charging detection ( #1595 )

@ -1 +1 @@
Subproject commit f5aa604efc7567dc1603ece3d933aa77197ee3d3 Subproject commit b10d106a55cb9e7e2da152206e4ac59fa3549c02