diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-09-02 11:54:41 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-09-02 11:54:41 +0100 |
| commit | 460f09d32a5160a31ae31e8c19e0317f26385eb8 (patch) | |
| tree | 8e321ff7bde324bc15b3d9fcca151ac3d9056326 | |
| parent | Merge branch 'develop' into anoa/v2_is (diff) | |
| parent | Update INSTALL.md to say that Python 2 is no longer supported (#5953) (diff) | |
| download | synapse-github/anoa/v2_is.tar.xz | |
Merge branch 'develop' into anoa/v2_is github/anoa/v2_is anoa/v2_is
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | changelog.d/5953.misc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/INSTALL.md b/INSTALL.md index 5728882460..6bce370ea8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -36,7 +36,7 @@ that your email address is probably `user@example.com` rather than System requirements: - POSIX-compliant system (tested on Linux & OS X) -- Python 3.5, 3.6, 3.7, or 2.7 +- Python 3.5, 3.6, or 3.7 - At least 1GB of free RAM if you want to join large public rooms like #matrix:matrix.org Synapse is written in Python but some of the libraries it uses are written in @@ -421,7 +421,7 @@ If Synapse is not configured with an SMTP server, password reset via email will The easiest way to create a new user is to do so from a client like [Riot](https://riot.im). -Alternatively you can do so from the command line if you have installed via pip. +Alternatively you can do so from the command line if you have installed via pip. This can be done as follows: diff --git a/changelog.d/5953.misc b/changelog.d/5953.misc new file mode 100644 index 0000000000..38e885f42a --- /dev/null +++ b/changelog.d/5953.misc @@ -0,0 +1 @@ +Update INSTALL.md to say that Python 2 is no longer supported. |