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