summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-08 14:11:37 +0100
committerErik Johnston <erik@matrix.org>2016-07-08 14:11:37 +0100
commit58930da52b073f16199b8f7fbe07075ff5f45d36 (patch)
treeba6bb7e4d34492d115d08e111a51f18abb969a3d /contrib
parentMerge pull request #911 from matrix-org/erikj/purge_history (diff)
parentMerge branch 'hotfixes-v0.16.1' (diff)
downloadsynapse-58930da52b073f16199b8f7fbe07075ff5f45d36.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions