diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-24 13:47:51 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-24 13:47:51 +0100 |
| commit | baf081cd3b040926e2d14dfd1c555307bba59245 (patch) | |
| tree | afca8b1c8ad1860b84cf5dbeff16205710e6bf74 /synapse/__init__.py | |
| parent | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff) | |
| parent | 1.2.0rc2 (diff) | |
| download | synapse-baf081cd3b040926e2d14dfd1c555307bba59245.tar.xz | |
Merge tag 'v1.2.0rc2' into develop
Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
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 f26e49da36..ca14545e4d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.2.0rc1" +__version__ = "1.2.0rc2" |