diff options
author | Erik Johnston <erik@matrix.org> | 2018-08-24 17:00:37 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-08-24 17:00:37 +0100 |
commit | 9db24769914f5c9a3081f549cbff92ef96042578 (patch) | |
tree | 5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /.dockerignore | |
parent | Newsfile (diff) | |
parent | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff) | |
download | synapse-9db24769914f5c9a3081f549cbff92ef96042578.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact
Diffstat (limited to '.dockerignore')
0 files changed, 0 insertions, 0 deletions