From 5f8ea912af2dd6e6028848c1ad061a71b973595e Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 23 Mar 2021 17:55:20 +0100 Subject: [PATCH 1/2] Updated Syncthing to v1.15.0-rc.6 --- syncthing/src/github.com/syncthing/syncthing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index 39c2d1bc..0d7a77ba 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit 39c2d1bc1a6de0800cb8ed11db692f97ff5f02c2 +Subproject commit 0d7a77ba85c69f9e427981b906c9a4941c4c0f9c From ed16aebb53ce9d867962c3c6c6d44bdf0d1757af Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 23 Mar 2021 17:58:32 +0100 Subject: [PATCH 2/2] Bumped version to 1.15.0-rc.6 --- app/build.gradle | 4 ++-- app/src/main/play/release-notes/en-GB/default.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e037d62..134b6628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,8 +41,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 16 targetSdkVersion 29 - versionCode 4268 - versionName "1.15.0-rc.5" + versionCode 4269 + versionName "1.15.0-rc.6" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/app/src/main/play/release-notes/en-GB/default.txt b/app/src/main/play/release-notes/en-GB/default.txt index dd3a1f3a..24a2d52d 100644 --- a/app/src/main/play/release-notes/en-GB/default.txt +++ b/app/src/main/play/release-notes/en-GB/default.txt @@ -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 )