diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-06-03 08:42:26 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-06-03 08:43:38 -0400 |
| commit | d7a646abcadc14db8116dbcf07e05ae94a7c3271 (patch) | |
| tree | 6675f5b0eac25b44c320d91e686363c8f34e7cf1 /synapse | |
| parent | Add new admin APIs to remove media by media ID from quarantine. (#10044) (diff) | |
| parent | Clarify changelog. (diff) | |
| download | synapse-d7a646abcadc14db8116dbcf07e05ae94a7c3271.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 |