Merge branch 'dev' of https://github.com/datarhei/restreamer-ui into dev

datarhei · Jan 26, 2024 · 6d60281 · 6d60281
2 parents d98ff90 + fda9f2a
commit 6d60281
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Restreamer-UI
 
+## v1.9.0 > v1.10.0
+
+-   Add resource usage and ffmpeg command to process details
+-   Add audio loop source
+-   Add to allow to select from already publishing RTMP and SRT streams
+-   Fix wrongly displayed SRT URL ([#635](https://github.com/datarhei/restreamer/issues/635))
+-   Fix RTMPS address with custom ports ([#658](https://github.com/datarhei/restreamer/issues/658))
+-   Fix allow RTSPS protocol ([#677](https://github.com/datarhei/restreamer/issues/677))
+
 ## v1.8.0 > v1.9.0
 
 -   Add enlarged channel overview

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "restreamer-ui",
-	"version": "1.9.0",
+	"version": "1.10.0",
 	"bundle": "restreamer-v2.7.0",
 	"private": false,
 	"license": "Apache-2.0",
@@ -95,4 +95,4 @@
 		"react-error-overlay": "^6.0.11"
 	},
 	"resolutions": {}
-}
+}