summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-09-07 15:11:36 +0100
committerMark Haines <mark.haines@matrix.org>2015-09-07 15:11:36 +0100
commitd23bc77e2c0720e8e79dfa1a8c7289838c9b9794 (patch)
treeb34392b4af082553f84584dda022d57f3c35aa9f /synapse
parentMerge branch 'master' into develop (diff)
parentMerge pull request #269 from matrix-org/markjh/upgrading_setuptools (diff)
downloadsynapse-d23bc77e2c0720e8e79dfa1a8c7289838c9b9794.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions