diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-03-12 16:55:25 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-03-12 16:55:25 +0000 |
commit | e90002ca1d7093e0e7ae0d256b5b9099a0fb1bb4 (patch) | |
tree | 4c5c1e1f503e04e83e48284b0272357b5dd7706e | |
parent | Appease pyflakes (diff) | |
parent | More sacrifices to the pep8 gods. (diff) | |
download | synapse-e90002ca1d7093e0e7ae0d256b5b9099a0fb1bb4.tar.xz |
Merge remote-tracking branch 'origin/develop' into metrics
-rw-r--r-- | synapse/push/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py |