summary refs log tree commit diff
path: root/changelog.d/6274.misc
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-04 18:22:41 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-04 18:22:41 +0000
commit506a63de67b63e09b500f377afd8074e25ea0d83 (patch)
tree2c311b5c243ac8567f27aae7ba1a0dd2a6a0a1cd /changelog.d/6274.misc
parentRe-add docstring, with caveats detailed (diff)
parentRemove the psutil dependency (#6318) (diff)
downloadsynapse-506a63de67b63e09b500f377afd8074e25ea0d83.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_groups
Diffstat (limited to 'changelog.d/6274.misc')
0 files changed, 0 insertions, 0 deletions