summary refs log tree commit diff
path: root/synapse/storage/account_data.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-18 11:00:43 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-10-18 11:00:43 +0100
commit1ee97cbd0198fcf87ba0257eae9b099cf25aa772 (patch)
tree6b2a5552f42c17d60de14c8693fcf67ee714a706 /synapse/storage/account_data.py
parentMerge pull request #6196 from matrix-org/erikj/await (diff)
parentMerge tag 'v1.4.1' (diff)
downloadsynapse-1ee97cbd0198fcf87ba0257eae9b099cf25aa772.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/storage/account_data.py')
0 files changed, 0 insertions, 0 deletions