summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-11-15 11:35:34 +0000
committerErik Johnston <erik@matrix.org>2017-11-15 11:35:34 +0000
commitaa812feb418182aa5ebca76e428ce0bb5ecd9841 (patch)
treea92abd0c867b6d5ff5f16ebcc67a01d93a685553 /contrib
parentMerge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs (diff)
parentMerge branch 'release-v0.25.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-aa812feb418182aa5ebca76e428ce0bb5ecd9841.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions