Merge branch 'master' of github.com:jc21/nginx-proxy-manager

Jamie Curnow · Jamie Curnow · commit e2c4b323114a · 2020-03-06T12:54:15.000+10:00
diff --git a/.version b/.version
@@ -1 +1 @@
-2.1.1
+2.1.2
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.1.1-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.1.2-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 
diff --git a/backend/.vscode/settings.json b/backend/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+	"editor.insertSpaces": false,
+	"editor.formatOnSave": true,
+	"files.trimTrailingWhitespace": true,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": true
+	}
+}
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "nginx-proxy-manager",
-	"version": "2.1.1",
+	"version": "2.1.2",
 	"description": "A beautiful interface for creating Nginx endpoints",
 	"main": "js/index.js",
 	"dependencies": {
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -30,7 +30,6 @@ RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -f /tmp/install-s6
 EXPOSE 80
 EXPOSE 81
 EXPOSE 443
-EXPOSE 9876
 
 COPY docker/rootfs      /
 ADD backend             /app
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "A beautiful interface for creating Nginx endpoints",
   "main": "js/index.js",
   "devDependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nginx-proxy-manager",`
`3`		`- "version": "2.1.1",`
	`3`	`+ "version": "2.1.2",`
`4`	`4`	`"description": "A beautiful interface for creating Nginx endpoints",`
`5`	`5`	`"main": "js/index.js",`
`6`	`6`	`"dependencies": {`