merging changes

2025-08-16 22:06:51 +00:00 · 2022-03-10 16:14:07 -05:00
parent 30c9a1fbbd
commit 6368c39ef7
7 changed files with 13 additions and 13 deletions
--- a/frontend/fonts/feather
+++ b/frontend/fonts/feather
@@ -1 +0,0 @@
-../node_modules/tabler-ui/dist/assets/fonts/feather
--- a/frontend/images
+++ b/frontend/images
@@ -1 +0,0 @@
-./node_modules/tabler-ui/dist/assets/images
--- a/frontend/js/i18n/messages.json
+++ b/frontend/js/i18n/messages.json
@@ -133,7 +133,8 @@
      "allow-websocket-upgrade": "Websockets Support",
      "ignore-invalid-upstream-ssl": "Ignore Invalid SSL",
      "custom-forward-host-help": "Add a path for sub-folder forwarding.\nExample: 203.0.113.25/path",
-      "search": "Search Host…"
+      "search": "Search Host…",
+      "forward-proxy-header": "Forward Hostname"
    },
    "redirection-hosts": {
      "title": "Redirection Hosts",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "nginx-proxy-manager",
-  "version": "0.0.0",
+  "version": "2.9.16",
  "description": "A beautiful interface for creating Nginx endpoints",
  "main": "js/index.js",
  "devDependencies": {
				`@@ -1 +0,0 @@`
				`../node_modules/tabler-ui/dist/assets/fonts/feather`
				`@@ -1 +0,0 @@`
				`./node_modules/tabler-ui/dist/assets/images`