summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-09 16:57:33 +0100
committerErik Johnston <erik@matrix.org>2016-06-09 16:57:33 +0100
commit16a88842334806111f4e52cfdcdcf2d8069a559f (patch)
tree6ef6a66d1e510fe14508b82c08624adad5f064b2 /setup.py
parentMerge pull request #862 from matrix-org/erikj/media_remote_error (diff)
parentMerge branch 'release-v0.16.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-16a88842334806111f4e52cfdcdcf2d8069a559f.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions