summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-12 11:19:37 +0000
committerErik Johnston <erik@matrix.org>2016-02-12 11:19:37 +0000
commitec0f3836ff8ac88019d9e83bea0995989ff53c00 (patch)
tree759fcffe94a168a21e4461418165e35914adcd22 /setup.py
parentMerge pull request #572 from matrix-org/daniel/exclusivity (diff)
parentMerge branch 'release-v0.13.3' of github.com:matrix-org/synapse (diff)
downloadsynapse-ec0f3836ff8ac88019d9e83bea0995989ff53c00.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