diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-08-22 14:37:11 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-08-22 14:37:11 +0100 |
| commit | c7181dcc6c7489008c8584640c9eea2438471b63 (patch) | |
| tree | 9aef422e4a89b3b288f1d8bdfdd98304daa96ec3 | |
| parent | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event (diff) | |
| parent | Use recaptcha_ajax.js directly from Google (diff) | |
| download | synapse-c7181dcc6c7489008c8584640c9eea2438471b63.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 13 | ||||
| -rw-r--r-- | changelog.d/3732.bugfix | 1 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index df01178971..a35f5aebc7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Synapse 0.33.3 (2018-08-22) +=========================== + +Bugfixes +-------- + +- Fix bug introduced in v0.33.3rc1 which made the ToS give a 500 error ([\#3732](https://github.com/matrix-org/synapse/issues/3732)) + + Synapse 0.33.3rc2 (2018-08-21) ============================== @@ -13,7 +22,7 @@ Synapse 0.33.3rc1 (2018-08-21) Features -------- -- Add support for the SNI extension to federation TLS connections ([\#1491](https://github.com/matrix-org/synapse/issues/1491)) +- Add support for the SNI extension to federation TLS connections. Thanks to @vojeroen! ([\#3439](https://github.com/matrix-org/synapse/issues/3439)) - Add /_media/r0/config ([\#3184](https://github.com/matrix-org/synapse/issues/3184)) - speed up /members API and add `at` and `membership` params as per MSC1227 ([\#3568](https://github.com/matrix-org/synapse/issues/3568)) - implement `summary` block in /sync response as per MSC688 ([\#3574](https://github.com/matrix-org/synapse/issues/3574)) @@ -97,7 +106,7 @@ Features Bugfixes -------- -- Make /directory/list API return 404 for room not found instead of 400 ([\#2952](https://github.com/matrix-org/synapse/issues/2952)) +- Make /directory/list API return 404 for room not found instead of 400. Thanks to @fuzzmz! ([\#3620](https://github.com/matrix-org/synapse/issues/3620)) - Default inviter_display_name to mxid for email invites ([\#3391](https://github.com/matrix-org/synapse/issues/3391)) - Don't generate TURN credentials if no TURN config options are set ([\#3514](https://github.com/matrix-org/synapse/issues/3514)) - Correctly announce deleted devices over federation ([\#3520](https://github.com/matrix-org/synapse/issues/3520)) diff --git a/changelog.d/3732.bugfix b/changelog.d/3732.bugfix deleted file mode 100644 index 638b6334b0..0000000000 --- a/changelog.d/3732.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix bug introduced in v0.33.3rc1 which made the ToS give a 500 error \ No newline at end of file diff --git a/synapse/__init__.py b/synapse/__init__.py index 252c49ca82..e62901b761 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -17,4 +17,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.33.3rc2" +__version__ = "0.33.3" |