summary refs log tree commit diff
path: root/synapse/media/v0
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-07 09:40:42 +0000
committerErik Johnston <erik@matrix.org>2015-01-07 09:40:42 +0000
commit1497e50649f2b3a7a4b7e119fd3cb85a22f87e92 (patch)
tree6e24afc0c9f112674e26662e470a178e60c955c4 /synapse/media/v0
parentOptimize FrozenEvent creation (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-1497e50649f2b3a7a4b7e119fd3cb85a22f87e92.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions