mirror of
https://github.com/syncthing/syncthing-android.git
synced 2025-02-02 15:21:36 +00:00
Merge branch 'release'
This commit is contained in:
commit
6d55619764
3 changed files with 4 additions and 5 deletions
|
@ -37,8 +37,8 @@ android {
|
||||||
applicationId "com.nutomic.syncthingandroid"
|
applicationId "com.nutomic.syncthingandroid"
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode 4234
|
versionCode 4235
|
||||||
versionName "1.6.0"
|
versionName "1.6.1"
|
||||||
testApplicationId 'com.nutomic.syncthingandroid.test'
|
testApplicationId 'com.nutomic.syncthingandroid.test'
|
||||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
* Fix startup problem when running as root ( https://github.com/syncthing/syncthing-android/issues/1504 )
|
* Update Syncthing to v1.6.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.1 )
|
||||||
* Update Syncthing to v1.6.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.0 )
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8c741776997fd22e8017c19650e40f22802372bd
|
Subproject commit d7c3d81dfb014e147bd96d4a4eeb52a185bf7dda
|
Loading…
Reference in a new issue