Merge branch 'develop', prepare 4.1.1

yamalight · yamalight · commit 64c6d9199c3c · 2019-03-31T12:02:35.000+02:00
diff --git a/Dockerfile-debug b/Dockerfile-debug
@@ -11,6 +11,9 @@ WORKDIR /usr/src/app
 COPY bin/server-core.js /usr/src/app/server-core.js
 COPY bin/exoframe-server.js /usr/src/app/exoframe-server.js
 
+# copy home.html
+COPY bin/home.html /usr/src/app/home.html
+
 # expose ports
 EXPOSE 8080
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "exoframe-server",
-  "version": "4.1.0",
+  "version": "4.1.1-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "bin/server-core.js",
   "bin": "bin/exoframe-server.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "exoframe-server",`
`3`		`- "version": "4.1.0",`
	`3`	`+ "version": "4.1.1-dev",`
`4`	`4`	`"description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",`
`5`	`5`	`"main": "bin/server-core.js",`
`6`	`6`	`"bin": "bin/exoframe-server.js",`