diff options
| author | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
| commit | 4202fba82a255eb52783a91d873b91aa8ef2191c (patch) | |
| tree | 73975e960b5a80f7a466cbf62810639662093d4a /res | |
| parent | replaced json.dumps with encode_canonical_json (diff) | |
| parent | Merge pull request #2292 from matrix-org/erikj/quarantine_media (diff) | |
| download | synapse-4202fba82a255eb52783a91d873b91aa8ef2191c.tar.xz | |
Merge branch 'develop' into avoid_duplicate_filters
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions