diff options
author | Neil Johnson <neil@matrix.org> | 2018-05-24 16:03:44 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-05-24 16:03:44 +0100 |
commit | 037c6db85dfdc629d662dfc5046f1f2df143bafc (patch) | |
tree | dba49776d8142e38ede7d42c965fbfb563478ad6 /Dockerfile | |
parent | Merge pull request #3261 from matrix-org/erikj/pagination_fixes (diff) | |
parent | Update CHANGES.rst (diff) | |
download | synapse-037c6db85dfdc629d662dfc5046f1f2df143bafc.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'Dockerfile')
0 files changed, 0 insertions, 0 deletions