diff options
author | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
commit | d6118c5be61aed49f1aa3fac53a25a670bbbd245 (patch) | |
tree | 269071e6c6a87cc70a177f48f9546e97a5b0f1e2 /docker/Dockerfile | |
parent | Newsfile (diff) | |
parent | Merge pull request #5103 from matrix-org/rav/fix_notif_loop (diff) | |
download | synapse-d6118c5be61aed49f1aa3fac53a25a670bbbd245.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_3pid_invite
Diffstat (limited to 'docker/Dockerfile')
0 files changed, 0 insertions, 0 deletions