diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-07-13 11:42:52 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-07-13 11:42:52 +0100 |
commit | 59e64b6d5b25734a07f5deb7e4996578b67d7273 (patch) | |
tree | 4cc73241dd547bcf02e6cfeb45928054b403ce95 /synapse/appservice/api.py | |
parent | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802) (diff) | |
parent | 1.17.0 (diff) | |
download | synapse-59e64b6d5b25734a07f5deb7e4996578b67d7273.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/appservice/api.py')
0 files changed, 0 insertions, 0 deletions