diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-02-05 11:04:24 +0000 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-02-05 11:04:24 +0000 |
commit | 489f92e0e5cc386078efc91699cf1344808c7b9b (patch) | |
tree | e10a6d5dad7e4bddf552d466f113b16b6bba215f /synapse/util/jsonobject.py | |
parent | Merge pull request #558 from matrix-org/daniel/config (diff) | |
parent | Host /media/r0 as well as /media/v1 (diff) | |
download | synapse-489f92e0e5cc386078efc91699cf1344808c7b9b.tar.xz |
Merge pull request #559 from matrix-org/daniel/media
Host /media/r0 as well as /media/v1
Diffstat (limited to 'synapse/util/jsonobject.py')
0 files changed, 0 insertions, 0 deletions