summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-08-30 17:18:57 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-08-30 17:18:57 +0100
commit0766ef23cf29293dc1944b71aa156d6f5074c79b (patch)
treef163b8ea47b7b12e3628d212a0bedee479320907 /synapse/storage/appservice.py
parentMerge branch 'develop' into anoa/v2_is (diff)
parentMerge branch 'develop' into anoa/m_id_access_token (diff)
downloadsynapse-0766ef23cf29293dc1944b71aa156d6f5074c79b.tar.xz
Merge branch 'anoa/m_id_access_token' into anoa/v2_is
Diffstat (limited to 'synapse/storage/appservice.py')
0 files changed, 0 insertions, 0 deletions