summary refs log tree commit diff
path: root/synapse/storage/pusher.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-17 12:13:14 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-17 12:13:14 +0000
commitd8a05418f97827fd768a1abc540b204f9120d50f (patch)
tree6827428a35bd8d65720b1cbd5bc2ba4f25d02eae /synapse/storage/pusher.py
parentMerge pull request #2686 from matrix-org/luke/as-flair (diff)
parentMerge branch 'release-v0.25.1' (diff)
downloadsynapse-d8a05418f97827fd768a1abc540b204f9120d50f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/storage/pusher.py')
0 files changed, 0 insertions, 0 deletions