summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-21 16:00:43 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-21 16:00:43 +0100
commit9f53491cabc9a7387fe442e8363ef668435d091e (patch)
tree84feb0ec411b40ac5844c4f144d163732c6f6914 /synapse/config/appservice.py
parentMerge branch 'develop' into markjh/slave_event_push_actions (diff)
parentpip install new python dependencies in jenkins.sh (diff)
downloadsynapse-9f53491cabc9a7387fe442e8363ef668435d091e.tar.xz
Merge branch 'develop' into markjh/slave_event_push_actions
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions