Merge pull request #31 from piratpartiet/feature/merge-trystant-master

Merge trystant master
piratpartiet · Apr 15, 2016 · d50abb7 · d50abb7
2 parents bf41952 + c76896e
commit d50abb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 env:
   - CXX=g++-4.8 NODE_ENV=test
 node_js:
+  - "5.5.0"
   - "4.2"
   - "4.1"
   - "4.0"

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ order to keep the app ready to use at all times.
 
 You need [Node.js](http://nodejs.org/download/) and a Relational Database
 Management System such as [Postgres](http://www.postgresql.org/download)
-installed and running.
+9.3 or higher installed and running.
 
 We use [`bcrypt`](https://github.com/ncb000gt/node.bcrypt.js) for hashing
 secrets. If you have issues during installation related to `bcrypt` then [refer
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ sudo: false @@
     env:
       - CXX=g++-4.8 NODE_ENV=test
     node_js:
+      - "5.5.0"
       - "4.2"
       - "4.1"
       - "4.0"
@@ Expand Down @@