summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-22 10:31:48 +0000
committerErik Johnston <erik@matrix.org>2016-11-22 10:31:48 +0000
commitbaf9e74a73fd1064a6767b6f82cb7f355630b1e6 (patch)
tree3e7980c20526f41de5973b57c098e5c99b77baac /res
parentMerge pull request #1636 from matrix-org/kegan/filter-error-msg (diff)
parentMerge branch 'release-v0.18.4' of github.com:matrix-org/synapse (diff)
downloadsynapse-baf9e74a73fd1064a6767b6f82cb7f355630b1e6.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions