summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-18 15:06:31 +0100
committerErik Johnston <erik@matrix.org>2016-08-18 15:06:31 +0100
commit19a625362b5edc8848e583dff3a306a3336191f3 (patch)
treef5341a997aa4149ad12bf2317fd384e3171f3862 /res
parentAdd appservice worker (diff)
parentJenkins: tox install setuptools (diff)
downloadsynapse-19a625362b5edc8848e583dff3a306a3336191f3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/appservice_stream
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions