summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-03-12 16:55:25 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-03-12 16:55:25 +0000
commite90002ca1d7093e0e7ae0d256b5b9099a0fb1bb4 (patch)
tree4c5c1e1f503e04e83e48284b0272357b5dd7706e /synapse/config
parentAppease pyflakes (diff)
parentMore sacrifices to the pep8 gods. (diff)
downloadsynapse-e90002ca1d7093e0e7ae0d256b5b9099a0fb1bb4.tar.xz
Merge remote-tracking branch 'origin/develop' into metrics
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions