Merge branch 'master' into stable

bugy · bugy · commit 0fe52160bf76 · 2019-05-08T08:46:33.000+02:00
diff --git a/web-src/js/common.js b/web-src/js/common.js
@@ -319,7 +319,7 @@ export function getWebsocketUrl(relativePath) {
 
     var dir = getUrlDir();
     if (dir) {
-        hostUrl += '/' + dir;
+        hostUrl += dir;
     }
 
     if (isEmptyString(relativePath)) {

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ export function getWebsocketUrl(relativePath) {`
`319`	`319`
`320`	`320`	`var dir = getUrlDir();`
`321`	`321`	`if (dir) {`
`322`		`- hostUrl += '/' + dir;`
	`322`	`+ hostUrl += dir;`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`if (isEmptyString(relativePath)) {`