diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-16 10:36:29 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-16 10:36:29 +0100 |
| commit | 789606577ade2335f19e944efcfecfe808519b36 (patch) | |
| tree | c50b78ee8ba6227e0e7114b2c18802dd23f0516b /synapse/__init__.py | |
| parent | Ensure the body is a string before comparing push rules. (#7701) (diff) | |
| parent | Fix changelog wording (diff) | |
| download | synapse-789606577ade2335f19e944efcfecfe808519b36.tar.xz | |
Merge branch 'master' into develop
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 |