diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-28 09:10:57 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-05-28 09:10:57 +0200 |
commit | d6d96bed80700830063c6055969d2d2ff46c63c6 (patch) | |
tree | d1fb4141ca788efaf2a54336e9a6a0df94c20ec6 /client/proxy.config.json | |
parent | 8f608a4cb22ab232cfab20665050764b38bac9c7 (diff) | |
parent | b55e7127d1eb6f167e45db2a1ad00197355d1d2f (diff) | |
download | PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.tar.gz PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.tar.zst PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.zip |
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'client/proxy.config.json')
-rw-r--r-- | client/proxy.config.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/proxy.config.json b/client/proxy.config.json index e7070522a..e9c6c4aff 100644 --- a/client/proxy.config.json +++ b/client/proxy.config.json | |||
@@ -24,6 +24,10 @@ | |||
24 | "secure": false, | 24 | "secure": false, |
25 | "ws": true | 25 | "ws": true |
26 | }, | 26 | }, |
27 | "/client/assets": { | ||
28 | "target": "http://localhost:9000", | ||
29 | "secure": false | ||
30 | }, | ||
27 | "/!(client)**": { | 31 | "/!(client)**": { |
28 | "target": "http://localhost:3000/client/index.html", | 32 | "target": "http://localhost:3000/client/index.html", |
29 | "secure": false, | 33 | "secure": false, |