diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-14 19:38:44 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2019-06-14 19:38:44 +0100 |
commit | 5c4296b47a9f4c77da99a03c420e12ec33ccd3b0 (patch) | |
tree | a93bce0e96ecaef07ba9f4f42b084d75d6442319 /synapse/server.py | |
parent | Merge pull request #5466 from matrix-org/babolivier/fix_deactivation_bg_job (diff) | |
parent | Add plugin APIs for implementations of custom event rules. (diff) | |
download | synapse-5c4296b47a9f4c77da99a03c420e12ec33ccd3b0.tar.xz |
Merge branch 'babolivier/third_party_event_rules' into dinsic
Diffstat (limited to 'synapse/server.py')
-rw-r--r-- | synapse/server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py |