diff options
author | Erik Johnston <erik@matrix.org> | 2021-05-17 12:14:58 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-05-17 12:14:58 +0100 |
commit | 653fe2f3cd49dbfe6e16597a3ab8d73c1fcb2832 (patch) | |
tree | 811fbcd684024e08ad6e16f001edea181697c119 /synapse/__init__.py | |
parent | Split multiplart email sending into a dedicated handler (#9977) (diff) | |
parent | Changelog (diff) | |
download | synapse-653fe2f3cd49dbfe6e16597a3ab8d73c1fcb2832.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 |