summary refs log tree commit diff
path: root/synapse/handlers/directory.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-14 11:36:23 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-14 11:36:23 +0100
commit243c56e725920035b3847fb504cbbaf73428e0ca (patch)
tree140dcae6cbc3c476e08032de7f3c4c6e5c324aea /synapse/handlers/directory.py
parentMerge branch 'develop' into notifier_unify (diff)
parentSpecify python 2.7 in the virtualenv setup (SYN-319) #resolved (diff)
downloadsynapse-243c56e725920035b3847fb504cbbaf73428e0ca.tar.xz
Merge branch 'develop' into notifier_unify
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions