summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-08-30 17:36:38 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-08-30 17:36:38 +0100
commitbed1e94ca05ab8b644e235f694502f23ceedd4fc (patch)
tree3f6f1663fd950381708ea3ecc40ab2e178c4bf9f /CHANGES.rst
parentMerge branch 'anoa/m_id_access_token' into anoa/v2_is (diff)
parentRevert "Add m.id_access_token flag (#5930)" (#5945) (diff)
downloadsynapse-bed1e94ca05ab8b644e235f694502f23ceedd4fc.tar.xz
Merge branch 'develop' into anoa/v2_is
Diffstat (limited to 'CHANGES.rst')
0 files changed, 0 insertions, 0 deletions