diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-02-17 16:33:21 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-02-17 16:33:21 +0000 |
commit | 0a714c3abf1628d8a8226867c0d6b836092ad16e (patch) | |
tree | aa3afba8f9994362e77bbb966ea855570b8c0f0d /synapse | |
parent | Raise the default power levels for invites, tombstones and server acls (#6834) (diff) | |
parent | Merge branch 'release-v1.10.1' (diff) | |
download | synapse-0a714c3abf1628d8a8226867c0d6b836092ad16e.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 9d285fca38..8313f177d2 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.10.0" +__version__ = "1.10.1" 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 |