diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-08-10 14:23:57 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-08-10 14:23:57 +0100 |
commit | b5de77cf8677c1cea0c686f6c92abc3c2f370d7b (patch) | |
tree | ed6c78c28bb0e6f830aad163c1f3ff6de92eba86 /synapse | |
parent | When redacting, keep event fields around that maintain the historical event s... (diff) | |
parent | 1.40.0 (diff) | |
download | synapse-b5de77cf8677c1cea0c686f6c92abc3c2f370d7b.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 |