diff options
author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
commit | b37e8c9572ef90367bef9e70b66150fdfe243e5d (patch) | |
tree | 1207a22a9529d48603317826926bc02866a474a0 /synapse/http/__init__.py | |
parent | isort (diff) | |
parent | Merge branch 'develop' into neilj/room_capabilities (diff) | |
download | synapse-b37e8c9572ef90367bef9e70b66150fdfe243e5d.tar.xz |
Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into neilj/room_capabilities
Diffstat (limited to 'synapse/http/__init__.py')
0 files changed, 0 insertions, 0 deletions