summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-07 09:45:42 +0000
committerErik Johnston <erik@matrix.org>2015-01-07 09:45:42 +0000
commit6536161e2a5e1d338475921407d7ce3fa07cc45c (patch)
tree6e24afc0c9f112674e26662e470a178e60c955c4 /setup.py
parentMerge branch 'master' into develop (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj-perf (diff)
downloadsynapse-6536161e2a5e1d338475921407d7ce3fa07cc45c.tar.xz
Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions