summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-19 15:13:36 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-19 15:13:36 +0000
commit39c3119c691d90cd745db31b175439737b04cd99 (patch)
tree2555ff233fd2e97734223582c96e502ef9fdb287 /synapse
parentMerge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff)
parent1.2.0rc2 (diff)
downloadsynapse-39c3119c691d90cd745db31b175439737b04cd99.tar.xz
1.2.0rc2
Diffstat (limited to '')
-rw-r--r--synapse/__init__.py2
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"