Skip to content
Snippets Groups Projects
Commit d09e24a5 authored by Erik Johnston's avatar Erik Johnston
Browse files

Merge branch 'master' into develop

parents 4911f793 1c8045f6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CHANGES.md
+ 6
− 0
View file @ d09e24a5
Synapse 1.36.0 (2021-06-15)
===========================
No significant changes.
Synapse 1.36.0rc2 (2021-06-11) Synapse 1.36.0rc2 (2021-06-11)
============================== ==============================
   
......
debian/changelog
+ 6
− 0
View file @ d09e24a5
matrix-synapse-py3 (1.36.0) stable; urgency=medium
* New synapse release 1.36.0.
-- Synapse Packaging team <packages@matrix.org> Tue, 15 Jun 2021 15:41:53 +0100
matrix-synapse-py3 (1.35.1) stable; urgency=medium matrix-synapse-py3 (1.35.1) stable; urgency=medium
* New synapse release 1.35.1. * New synapse release 1.35.1.
......
synapse/__init__.py
+ 1
− 1
View file @ d09e24a5
...@@ -47,7 +47,7 @@ try: ...@@ -47,7 +47,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.36.0rc2" __version__ = "1.36.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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment