summary refs log tree commit diff
path: root/synapse/storage/events.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-25 17:08:09 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-25 17:08:09 +0100
commite5da60d75db8b77b995fd95734c874e828d7f146 (patch)
tree6eb8116580b0d54e81592469c0a643d5ed7531c2 /synapse/storage/events.py
parentMerge pull request #4051 from matrix-org/erikj/alias_disallow_list (diff)
parentMerge pull request #4072 from steamp0rt/patch-1 (diff)
downloadsynapse-e5da60d75db8b77b995fd95734c874e828d7f146.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/storage/events.py')
0 files changed, 0 insertions, 0 deletions