summary refs log tree commit diff
path: root/UPGRADE.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-04 17:59:16 +0100
committerErik Johnston <erik@matrix.org>2021-05-04 17:59:16 +0100
commit5b031e2da3233a8e37b0e169d85423ff8fc1f149 (patch)
tree2374eb0772e8bd0bd55fbdf3f796007d6627182d /UPGRADE.rst
parentMerge branch 'erikj/refactor_keyring' into erikj/test_send (diff)
parentBugfix newsfile (diff)
downloadsynapse-5b031e2da3233a8e37b0e169d85423ff8fc1f149.tar.xz
Merge branch 'erikj/fix_presence_joined' into erikj/test_send
Diffstat (limited to 'UPGRADE.rst')
0 files changed, 0 insertions, 0 deletions