summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-20 16:09:27 +0100
committerErik Johnston <erik@matrix.org>2015-08-20 16:09:27 +0100
commit3befc9ccc3b7d19fc7c19af3ee9572d89e0fe127 (patch)
tree1949a627914b7f22f4450fc76d133db49e278b3b /synapse/storage
parentMerge pull request #235 from matrix-org/erikj/room_avatars (diff)
parentMerge pull request #237 from matrix-org/markjh/readme-rst-formatting (diff)
downloadsynapse-3befc9ccc3b7d19fc7c19af3ee9572d89e0fe127.tar.xz
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions