mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-12-22 19:01:30 +00:00
Merge branch 'release'
This commit is contained in:
commit
8593025264
3 changed files with 4 additions and 4 deletions
|
@ -41,8 +41,8 @@ android {
|
||||||
applicationId "com.nutomic.syncthingandroid"
|
applicationId "com.nutomic.syncthingandroid"
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 4268
|
versionCode 4269
|
||||||
versionName "1.15.0-rc.5"
|
versionName "1.15.0-rc.6"
|
||||||
testApplicationId 'com.nutomic.syncthingandroid.test'
|
testApplicationId 'com.nutomic.syncthingandroid.test'
|
||||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
* Update Syncthing to v1.15.0-rc.5 ( https://github.com/syncthing/syncthing/releases/tag/v1.15.0-rc.5 )
|
* Update Syncthing to v1.15.0-rc.6 ( https://github.com/syncthing/syncthing/releases/tag/v1.15.0-rc.6 )
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 39c2d1bc1a6de0800cb8ed11db692f97ff5f02c2
|
Subproject commit 0d7a77ba85c69f9e427981b906c9a4941c4c0f9c
|
Loading…
Reference in a new issue