diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-05-24 10:33:12 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-05-24 10:33:12 +0100 |
commit | 8c98281b8da9c4a8dd3d298c24fb35158682f4c1 (patch) | |
tree | dc14eca4295bac6480da9d30cb95b40917bb6674 /synapse/util/jsonobject.py | |
parent | Merge pull request #3268 from matrix-org/rav/privacy_policy_docs (diff) | |
parent | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url (diff) | |
download | synapse-8c98281b8da9c4a8dd3d298c24fb35158682f4c1.tar.xz |
Merge branch 'release-v0.30.0' into develop
Diffstat (limited to 'synapse/util/jsonobject.py')
0 files changed, 0 insertions, 0 deletions