Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Richard van der Hoff 2017-09-05 21:58:19 +01:00
commit 5f59f20636
3 changed files with 3 additions and 0 deletions

View file

@ -27,4 +27,5 @@ exclude jenkins*.sh
exclude jenkins* exclude jenkins*
recursive-exclude jenkins *.sh recursive-exclude jenkins *.sh
prune .github
prune demo/etc prune demo/etc

View file

@ -1,6 +1,8 @@
Using Postgres Using Postgres
-------------- --------------
Postgres version 9.4 or later is known to work.
Set up database Set up database
=============== ===============