summary refs log tree commit diff
path: root/synapse/media/v0/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-11 17:48:48 +0000
committerErik Johnston <erik@matrix.org>2014-12-11 17:48:48 +0000
commitcde840a82c9397f9f880102520d0193462efc13f (patch)
tree7e875e0514fd8db28244ba813927d293c4cb7929 /synapse/media/v0/__init__.py
parentFix replication tests (diff)
parentMerge pull request #23 from matrix-org/media_repository (diff)
downloadsynapse-cde840a82c9397f9f880102520d0193462efc13f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts:
	setup.py
Diffstat (limited to 'synapse/media/v0/__init__.py')
-rw-r--r--synapse/media/v0/__init__.py0
1 files changed, 0 insertions, 0 deletions
diff --git a/synapse/media/v0/__init__.py b/synapse/media/v0/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/synapse/media/v0/__init__.py