diff options
author | Erik Johnston <erik@matrix.org> | 2016-07-08 14:11:37 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-07-08 14:11:37 +0100 |
commit | 58930da52b073f16199b8f7fbe07075ff5f45d36 (patch) | |
tree | ba6bb7e4d34492d115d08e111a51f18abb969a3d /contrib | |
parent | Merge pull request #911 from matrix-org/erikj/purge_history (diff) | |
parent | Merge branch 'hotfixes-v0.16.1' (diff) | |
download | synapse-58930da52b073f16199b8f7fbe07075ff5f45d36.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions