diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-16 15:10:16 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-16 15:10:16 +0100 |
| commit | bfb6c586249069ccec46437536607fec3b2e4031 (patch) | |
| tree | 41dcc4a5be007ec0ed7e3c4c271893eae022eb46 /res | |
| parent | check for room state before deciding on action (diff) | |
| parent | Add GET media/v1/config (#3184) (diff) | |
| download | synapse-bfb6c586249069ccec46437536607fec3b2e4031.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions