diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-09-05 21:58:19 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-09-05 21:58:19 +0100 |
| commit | 5f59f2063675f3415193abb97cc7c60e4f8aed50 (patch) | |
| tree | b09edcaebd066774b716ea2dbf9871183dc587c3 | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Exclude the github issue template from our sdist (#2440) (diff) | |
| download | synapse-5f59f2063675f3415193abb97cc7c60e4f8aed50.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .github/ISSUE_TEMPLATE.md (renamed from ISSUE_TEMPLATE.md) | 0 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | docs/postgres.rst | 2 |
3 files changed, 3 insertions, 0 deletions
diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d2050a3e44..d2050a3e44 100644 --- a/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md diff --git a/MANIFEST.in b/MANIFEST.in index 981698143f..afb60e12ee 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -27,4 +27,5 @@ exclude jenkins*.sh exclude jenkins* recursive-exclude jenkins *.sh +prune .github prune demo/etc diff --git a/docs/postgres.rst b/docs/postgres.rst index b592801e93..904942ec74 100644 --- 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 =============== |