summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-23 11:26:31 +0000
committerErik Johnston <erik@matrix.org>2018-02-23 11:26:31 +0000
commita90c60912f3bd03c71086c061030736f9a9126b8 (patch)
tree1a9c2452b19ff8e2b648c646365d72e29da8eea8 /synapse/appservice
parentUpdate copyright (diff)
parentMerge pull request #2902 from matrix-org/erikj/split_events_store (diff)
downloadsynapse-a90c60912f3bd03c71086c061030736f9a9126b8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_event_push_actions
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions