Merge pull request #31 from SpringRoll/bugfix/node-10-installations

Bugfix/node 10 installations
SpringRoll · Aug 21, 2018 · 2bf22a9 · 2bf22a9
2 parents 444d072 + f643652
commit 2bf22a9
Show file tree

Hide file tree

Showing 4 changed files with 3,394 additions and 1,992 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 COPY package.json /package.json
 COPY npm-shrinkwrap.json /npm-shrinkwrap.json

diff --git a/app/routes/index.js b/app/routes/index.js
@@ -15,7 +15,7 @@ module.exports = function(app)
 		res.locals.version = app.get('version');
 		res.locals.marked = function(str)
 		{
-			return marky(str).html();
+			return marky(str);
 		};
 		res.locals.isActive = function(url, undefined)
 		{