summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 11:14:33 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 11:14:33 +0000
commit2c9e136d5721d1797e153268f4562c27887a6201 (patch)
tree8befee5ce84393b2a928ce909e2fa28ab1a09282 /synapse/storage
parentMerge branch 'develop' of github.com:matrix-org/synapse into rejections (diff)
downloadsynapse-2c9e136d5721d1797e153268f4562c27887a6201.tar.xz
Fix bad merge fo python_dependencies.py
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions