diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-16 11:37:17 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-16 11:37:17 +0100 |
commit | 25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a (patch) | |
tree | 64576e7083a569f13765c8d3a41fe6326ac631fa /synapse/config/appservice.py | |
parent | WIP impl commiting to get feedback (diff) | |
parent | initial cut at a room summary API (#3574) (diff) | |
download | synapse-25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions