diff options
author | Erik Johnston <erik@matrix.org> | 2018-02-23 11:26:31 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-02-23 11:26:31 +0000 |
commit | a90c60912f3bd03c71086c061030736f9a9126b8 (patch) | |
tree | 1a9c2452b19ff8e2b648c646365d72e29da8eea8 /res | |
parent | Update copyright (diff) | |
parent | Merge pull request #2902 from matrix-org/erikj/split_events_store (diff) | |
download | synapse-a90c60912f3bd03c71086c061030736f9a9126b8.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_event_push_actions
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions