diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
| commit | c2b4621630d982a38585c177d7c960c5127620bf (patch) | |
| tree | 8fdd440785ed56531c36e0f34e65fe139e6ce541 /synapse/__init__.py | |
| parent | Incorporate review (diff) | |
| parent | Remove "user_id" from GET /presence. (#7606) (diff) | |
| download | synapse-c2b4621630d982a38585c177d7c960c5127620bf.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/__init__.py')
| -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 39c3a3ba4d..1d9d85a727 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.15.0rc1" +__version__ = "1.15.0" 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 |