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

2017-09-05 21:58:19 +01:00 · 2017-09-05 21:58:19 +01:00 · 5f59f20636
parent 4b616c8cf2 59de2c7afa
commit 5f59f20636
3 changed files with 3 additions and 0 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -27,4 +27,5 @@ exclude jenkins*.sh
 exclude jenkins*
 recursive-exclude jenkins *.sh

+prune .github
 prune demo/etc
--- a/docs/postgres.rst
+++ b/docs/postgres.rst
@ -1,6 +1,8 @@
 Using Postgres
 --------------

+Postgres version 9.4 or later is known to work.
+
 Set up database
 ===============