From 5e287b8044fc49b2886a2fb4cddabb8598bcd45e Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Wed, 13 Mar 2019 15:39:35 +0100 Subject: [PATCH] Bumped version to 1.1.1-rc.1 (#1290) --- app/build.gradle | 4 ++-- app/src/main/play/en-GB/whatsnew | 3 +-- syncthing/src/github.com/syncthing/syncthing | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fc31cd83..321c6808 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 16 targetSdkVersion 26 - versionCode 4161 - versionName "0.10.19" + versionCode 4162 + versionName "1.1.1-rc.1" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' playAccountConfig = playAccountConfigs.defaultAccountConfig diff --git a/app/src/main/play/en-GB/whatsnew b/app/src/main/play/en-GB/whatsnew index 657023c6..d9139ac7 100644 --- a/app/src/main/play/en-GB/whatsnew +++ b/app/src/main/play/en-GB/whatsnew @@ -1,2 +1 @@ -* Update syncthing to v1.1.0 -* Fallback to http if https with TLS 1.2 is unavailable (#1255) +* Update syncthing to v1.1.1-rc.1 diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index f0f79a3e..50d8c43e 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit f0f79a3e3e861b79da2b09f563e9d373255419f0 +Subproject commit 50d8c43e7ccb9e14de66bac1545efaa1cdde6c38