Merge branch 'v2.3.x-lts'

Julusian · Julusian · commit 22ef6855de19 · 2020-12-15T11:02:34.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+CasparCG 2.3.1 Stable
+==========================================
+
+### Producers
+##### Fixes
+* Flash: Use proper file urls when loading templates, to allow it to work after Flash Player EOL
+* FFmpeg: Various HTTP playback improvements
+
+
 CasparCG 2.3.0 Stable
 ==========================================
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
 PROJECT ("CasparCG Server")
 SET (CONFIG_VERSION_MAJOR 2)
 SET (CONFIG_VERSION_MINOR 3)
-SET (CONFIG_VERSION_BUG 0)
+SET (CONFIG_VERSION_BUG 1)
 SET (CONFIG_VERSION_TAG "Dev")
 
 option(ENABLE_HTML "Enable HTML module, require CEF" ON)
