diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-09 15:20:56 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-09 15:20:56 +0000 |
| commit | 53557fc53259631d71055ef2ab8a6916b00d229b (patch) | |
| tree | 208db19fb5bbcc5416e669bc496adc49acdcb1a7 /synapse/rest/media/v1/base_resource.py | |
| parent | Fix bugs so lazy room joining works as intended. (diff) | |
| parent | Merge pull request #55 from matrix-org/profiling (diff) | |
| download | synapse-53557fc53259631d71055ef2ab8a6916b00d229b.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/rest/media/v1/base_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/base_resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/base_resource.py b/synapse/rest/media/v1/base_resource.py |