nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-22 20:31:16 +00:00
Code Releases Activity

Merge branch 'release'

Browse source
This commit is contained in:
Simon Frei 2020-06-02 08:34:40 +02:00
commit 6b3a6217bd
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -37,8 +37,8 @@ android {
applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16
targetSdkVersion 28
versionCode 4231
versionName "1.6.0-rc.4"
versionCode 4234
versionName "1.6.0"
testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

3
app/src/main/play/release-notes/en-GB/default.txt
View file

@ -1 +1,2 @@
* Update Syncthing to v1.6.0-rc.4 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.0-rc.4 )
* Fix startup problem when running as root ( https://github.com/syncthing/syncthing-android/issues/1504 )
* Update Syncthing to v1.6.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.0 )

2
syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 22c222bf75d6f1e1887e8c4ad2702d697e600141
Subproject commit 8c741776997fd22e8017c19650e40f22802372bd