summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-24 16:03:44 +0100
committerNeil Johnson <neil@matrix.org>2018-05-24 16:03:44 +0100
commit037c6db85dfdc629d662dfc5046f1f2df143bafc (patch)
treedba49776d8142e38ede7d42c965fbfb563478ad6 /res
parentMerge pull request #3261 from matrix-org/erikj/pagination_fixes (diff)
parentUpdate CHANGES.rst (diff)
downloadsynapse-037c6db85dfdc629d662dfc5046f1f2df143bafc.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions