diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:08:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:08:28 +0000 |
| commit | e0b7c521cbe4d9aa4403a8e5394177a51c6d5d8f (patch) | |
| tree | f84a3b1845ff2e6df699d69f3fbb99a2c1ed918b /synapse/rest/media/__init__.py | |
| parent | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... (diff) | |
| parent | We do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff) | |
| download | synapse-e0b7c521cbe4d9aa4403a8e5394177a51c6d5d8f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/rest/media/__init__.py')
| -rw-r--r-- | synapse/rest/media/__init__.py | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/synapse/rest/media/__init__.py b/synapse/rest/media/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/synapse/rest/media/__init__.py
|