diff options
| author | Erik Johnston <erik@matrix.org> | 2018-02-23 11:46:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-02-23 11:46:24 +0000 |
| commit | d62ce972f8170ae8d1708fb4b4a47a6a1938f4d9 (patch) | |
| tree | 8cea5b32d1569652a1baf68347d6f353124dcc21 /synapse/appservice | |
| parent | Update copyright (diff) | |
| parent | Merge pull request #2900 from matrix-org/erikj/split_event_push_actions (diff) | |
| download | synapse-d62ce972f8170ae8d1708fb4b4a47a6a1938f4d9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_roommember_store
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions