diff options
| author | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
| commit | d773290cb1d015f0debe5f64f4e495612cf1da60 (patch) | |
| tree | 33a7294ddad2c3fbbcbbd7b4831b6813176515dd /docs | |
| parent | Merge pull request #6664 from matrix-org/erikj/media_admin_apis (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-d773290cb1d015f0debe5f64f4e495612cf1da60.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions