summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-08 16:46:56 +0100
committerErik Johnston <erik@matrix.org>2015-04-08 16:46:56 +0100
commita43b40449b5257cec4e2e740c2f90728be84b695 (patch)
tree805220033f1fcc25dbf88e0356ee3f90ec7a3970 /setup.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into mysql (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-a43b40449b5257cec4e2e740c2f90728be84b695.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions