Catfriend1 · Catfriend1 · Mar 17, 2021 · Mar 13, 2021 · Mar 13, 2021 · Mar 13, 2021
diff --git a/SyncthingNative_update_and_build.cmd b/SyncthingNative_update_and_build.cmd
@@ -9,7 +9,7 @@ REM Script Consts.
 SET CLEAN_BEFORE_BUILD=1
 SET SKIP_CHECKOUT_SRC=0
 SET USE_GO_DEV=0
-SET DESIRED_SUBMODULE_VERSION=v1.14.0
+SET DESIRED_SUBMODULE_VERSION=v1.15.0-rc.4
 SET GRADLEW_PARAMS=-q
 REM
 REM Runtime Variables.

diff --git a/app/src/main/play/release-notes/en-GB/beta.txt b/app/src/main/play/release-notes/en-GB/beta.txt
@@ -1,14 +1,12 @@
-* Syncthing v1.14.0
-* Support new v1.14.x config format in the wrapper (#750)
+* Syncthing v1.15.0-rc.4
 
 Enhanced
 --
 
 
 Fixes
 --
-- Fixed "maxConflicts" setting not preserved by wrapper (#750)
-- Fixed Work profile path bug (#733)
+
 
 Other issues
 --

diff --git a/app/versions.gradle b/app/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     versionMajor = 1
-    versionMinor = 14
+    versionMinor = 15
     versionPatch = 0
-    versionWrapper = 1
+    versionWrapper = 0
 }
diff --git a/git_diff_master.cmd → git_diff_main.cmd b/git_diff_master.cmd → git_diff_main.cmd
@@ -12,7 +12,7 @@ SET GIT_BIN=
 FOR /F "tokens=*" %%A IN ('where git 2^> NUL:') DO SET GIT_BIN="%%A"
 IF NOT EXIST %GIT_BIN% echo [ERROR] GIT_BIN not found. & goto :pauseExit
 REM 
-call :runGit --no-pager diff master
+call :runGit --no-pager diff main
 REM 
 pause
 goto :eof

diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing