summary refs log tree commit diff
path: root/synapse/handlers/directory.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-03-03 19:14:02 +0000
committerRichard van der Hoff <richard@matrix.org>2016-03-03 19:14:02 +0000
commit361fc53917cfe29549a6b678bbfefc07b94bd518 (patch)
tree7f9c37afab5515c7ac67ac91ac86da1f6db398b0 /synapse/handlers/directory.py
parentMerge remote-tracking branch 'origin/develop' into rav/SYN-642 (diff)
parentjenkins-*.sh: set -x (diff)
downloadsynapse-361fc53917cfe29549a6b678bbfefc07b94bd518.tar.xz
Merge branch 'develop' into rav/SYN-642
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions