diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-08-22 17:16:48 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-08-22 17:16:48 +0200 |
| commit | 001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd (patch) | |
| tree | 9a88235affe49fce4b7ce2df192931cffaec32e9 /client/angular.json | |
| parent | d5c8932a601c1854db0a2e399ccaf26e17385f1a (diff) | |
| parent | 60c2bc80b82c71bd63bdb1fcf64d4d49491ce5c8 (diff) | |
| download | PeerTube-001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd.tar.gz PeerTube-001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd.tar.zst PeerTube-001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd.zip | |
Merge branch 'release/1.4.0' into develop
Diffstat (limited to 'client/angular.json')
| -rw-r--r-- | client/angular.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/angular.json b/client/angular.json index e1e4f4850..950ac059e 100644 --- a/client/angular.json +++ b/client/angular.json | |||
| @@ -86,7 +86,8 @@ | |||
| 86 | "options": { | 86 | "options": { |
| 87 | "baseHref": "/", | 87 | "baseHref": "/", |
| 88 | "deployUrl": "client/", | 88 | "deployUrl": "client/", |
| 89 | "browserTarget": "PeerTube:build" | 89 | "browserTarget": "PeerTube:build", |
| 90 | "proxyConfig": "proxy.config.json" | ||
| 90 | }, | 91 | }, |
| 91 | "configurations": { | 92 | "configurations": { |
| 92 | "production": { | 93 | "production": { |
| @@ -96,7 +97,8 @@ | |||
| 96 | "browserTarget": "PeerTube:build:hmr" | 97 | "browserTarget": "PeerTube:build:hmr" |
| 97 | }, | 98 | }, |
| 98 | "e2e": { | 99 | "e2e": { |
| 99 | "browserTarget": "PeerTube:build:e2e" | 100 | "browserTarget": "PeerTube:build:e2e", |
| 101 | "proxyConfig": "e2e/proxy.config.json" | ||
| 100 | } | 102 | } |
| 101 | } | 103 | } |
| 102 | }, | 104 | }, |