diff options
author | Erik Johnston <erik@matrix.org> | 2021-03-08 14:06:35 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-03-08 14:06:35 +0000 |
commit | b988b07bb0d07d5d5f1323cc4d3282f5876b62f6 (patch) | |
tree | d0db1db9c73674283bbc329fc118655f7e9bca5e /synapse | |
parent | Create a SynapseReactor type which incorporates the necessary reactor interfa... (diff) | |
parent | Fixup changelog (diff) | |
download | synapse-b988b07bb0d07d5d5f1323cc4d3282f5876b62f6.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 |