diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-19 15:13:36 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-19 15:13:36 +0000 |
commit | 39c3119c691d90cd745db31b175439737b04cd99 (patch) | |
tree | 2555ff233fd2e97734223582c96e502ef9fdb287 | |
parent | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff) | |
parent | 1.2.0rc2 (diff) | |
download | synapse-39c3119c691d90cd745db31b175439737b04cd99.tar.xz |
1.2.0rc2
-rw-r--r-- | CHANGES.md | 9 | ||||
-rw-r--r-- | changelog.d/5734.bugfix | 1 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md |