summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-19 11:12:33 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-19 11:12:33 +0100
commit1ffb7bec2090df16b66bb803a8540e5f20b1649d (patch)
tree8ffb1ee66a6a7008fb3cc8578f3ab1f3ed6c5af7 /synapse/api
parentMerge pull request #3556 from matrix-org/rav/background_processes (diff)
parentMerge pull request #3561 from matrix-org/rav/disable_logcontext_warning (diff)
downloadsynapse-1ffb7bec2090df16b66bb803a8540e5f20b1649d.tar.xz
Merge remote-tracking branch 'origin/release-v0.33.0' into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions