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 2021-04-13 15:17:05 +02:00
parent 8593025264 c59de6b7ec
commit a4f87b4ce2
No known key found for this signature in database
GPG Key ID: 7C31D23ECB1006F3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -41,8 +41,8 @@ android {
applicationId "com.nutomic.syncthingandroid" applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 29 targetSdkVersion 29
versionCode 4269 versionCode 4270
versionName "1.15.0-rc.6" versionName "1.15.1"
testApplicationId 'com.nutomic.syncthingandroid.test' testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }

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

@ -1 +1 @@
* Update Syncthing to v1.15.0-rc.6 ( https://github.com/syncthing/syncthing/releases/tag/v1.15.0-rc.6 ) * Update Syncthing to v1.15.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.15.1 )

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

@ -1 +1 @@
Subproject commit 0d7a77ba85c69f9e427981b906c9a4941c4c0f9c Subproject commit 13679284ac04c1e041f322e6f6ee8340c0aa33b4