summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-10 16:55:06 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-10 16:55:06 +0000
commit4f37c0ea9dd99b76258d07059e5f2dc6549f3f95 (patch)
tree3130a9b275d0f77c04118d54334ca3d4a9b7d71d /setup.py
parentupdate media repository implementation docs (diff)
parentoops (diff)
downloadsynapse-4f37c0ea9dd99b76258d07059e5f2dc6549f3f95.tar.xz
Merge branch 'develop' into media_repository
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions