diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-04-15 15:22:14 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-04-15 15:22:14 +0100 |
commit | 7d71975e6a3c247d1502e54b5aac831ee08510fb (patch) | |
tree | 11587d8c8ca98bbc20cafdf70f7453cdaa429cc8 /synapse/events/spamcheck.py | |
parent | Add config option to block users from looking up 3PIDs (#5010) (diff) | |
parent | update grafana dashboard (diff) | |
download | synapse-7d71975e6a3c247d1502e54b5aac831ee08510fb.tar.xz |
Merge branch 'develop' into dinsic
Diffstat (limited to 'synapse/events/spamcheck.py')
-rw-r--r-- | synapse/events/spamcheck.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py index 92aaa05e79..93242658ba 100644 --- a/synapse/events/spamcheck.py +++ b/synapse/events/spamcheck.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2017 New Vector Ltd. +# Copyright 2017 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |