mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-26 03:25:53 +03:00
Merge branch 'master' into develop
This commit is contained in:
commit
b988b07bb0
3 changed files with 14 additions and 5 deletions
10
CHANGES.md
10
CHANGES.md
|
@ -1,9 +1,15 @@
|
||||||
Synapse 1.29.0rc1 (2021-03-04)
|
Synapse 1.29.0 (2021-03-08)
|
||||||
==============================
|
===========================
|
||||||
|
|
||||||
Note that synapse now expects an `X-Forwarded-Proto` header when used with a reverse proxy. Please see [UPGRADE.rst](UPGRADE.rst#upgrading-to-v1290) for more details on this change.
|
Note that synapse now expects an `X-Forwarded-Proto` header when used with a reverse proxy. Please see [UPGRADE.rst](UPGRADE.rst#upgrading-to-v1290) for more details on this change.
|
||||||
|
|
||||||
|
|
||||||
|
No significant changes.
|
||||||
|
|
||||||
|
|
||||||
|
Synapse 1.29.0rc1 (2021-03-04)
|
||||||
|
==============================
|
||||||
|
|
||||||
Features
|
Features
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,9 +1,12 @@
|
||||||
matrix-synapse-py3 (1.29.0) UNRELEASED; urgency=medium
|
matrix-synapse-py3 (1.29.0) stable; urgency=medium
|
||||||
|
|
||||||
[ Jonathan de Jong ]
|
[ Jonathan de Jong ]
|
||||||
* Remove the python -B flag (don't generate bytecode) in scripts and documentation.
|
* Remove the python -B flag (don't generate bytecode) in scripts and documentation.
|
||||||
|
|
||||||
-- Synapse Packaging team <packages@matrix.org> Fri, 26 Feb 2021 14:41:31 +0100
|
[ Synapse Packaging team ]
|
||||||
|
* New synapse release 1.29.0.
|
||||||
|
|
||||||
|
-- Synapse Packaging team <packages@matrix.org> Mon, 08 Mar 2021 13:51:50 +0000
|
||||||
|
|
||||||
matrix-synapse-py3 (1.28.0) stable; urgency=medium
|
matrix-synapse-py3 (1.28.0) stable; urgency=medium
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
__version__ = "1.29.0rc1"
|
__version__ = "1.29.0"
|
||||||
|
|
||||||
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
||||||
# We import here so that we don't have to install a bunch of deps when
|
# We import here so that we don't have to install a bunch of deps when
|
||||||
|
|
Loading…
Reference in a new issue