summary refs log tree commit diff
path: root/push.py
diff options
context:
space:
mode:
authorCaleb James DeLisle <cjd@cjdns.fr>2017-06-23 15:15:18 +0200
committerCaleb James DeLisle <cjd@cjdns.fr>2017-06-23 15:15:18 +0200
commit75eba3b07d58743f24068efef67d5755f58207ba (patch)
tree57ee957b40b4cfbabd2be0545fe1fe0fe24af3a7 /push.py
parentAdd configuration parameter to allow redaction of content from push messages ... (diff)
downloadsynapse-75eba3b07d58743f24068efef67d5755f58207ba.tar.xz
Fix TravisCI tests for PR #2301
Diffstat (limited to '')
-rw-r--r--push.py (renamed from synapse/config/pushconfig.py)3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/config/pushconfig.py b/push.py

index afe8aba0a8..4e5f428820 100644 --- a/synapse/config/pushconfig.py +++ b/push.py
@@ -13,9 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file can't be called email.py because if it is, we cannot: -import email.utils - from ._base import Config