nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Merge branch 'release'

This commit is contained in:
Simon Frei 2020-06-02 14:38:35 +02:00
parent 6b3a6217bd d437e5faaf
commit 6d55619764
3 changed files with 4 additions and 5 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 4234
versionName "1.6.0"
versionCode 4235
versionName "1.6.1"
testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

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

@ -1,2 +1 @@
* 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 )
* Update Syncthing to v1.6.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.1 )

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

@ -1 +1 @@
Subproject commit 8c741776997fd22e8017c19650e40f22802372bd
Subproject commit d7c3d81dfb014e147bd96d4a4eeb52a185bf7dda