Merge branch 'master' into frontend_runtime_config

2022-11-21 17:46:02 +09:00
parent 4fc355a05d e051758ca7
commit 235ac204b4
19 changed files with 253 additions and 36 deletions
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -221,6 +221,10 @@
              "proxyConfig": "proxy.conf.local.js",
              "verbose": true
            },
+            "local-esplora": {
+              "proxyConfig": "proxy.conf.local-esplora.js",
+              "verbose": true
+            },
            "mixed": {
              "proxyConfig": "proxy.conf.mixed.js",
              "verbose": true