summary refs log tree commit diff
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-26 13:49:24 +0000
committerErik Johnston <erik@matrix.org>2018-02-26 13:49:24 +0000
commit45b5fe91225e9188ccd2a3983b125d0c6901fbb9 (patch)
tree63c99e09fabe0a21f9465b1c3bf14cbef493d708 /MANIFEST.in
parentActually use new param (diff)
parentMerge pull request #2900 from matrix-org/erikj/split_event_push_actions (diff)
downloadsynapse-45b5fe91225e9188ccd2a3983b125d0c6901fbb9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/handle_unpersisted_events_push
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions