summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-05 15:35:05 +0000
committerErik Johnston <erik@matrix.org>2015-11-05 15:35:05 +0000
commit7a5ea067e2e5470f6d1e0205a740fd9ea389531c (patch)
treece8db7f95fd245afbb99e1dfecf9dbeaf6db0b30 /synapse/storage
parentMerge pull request #341 from matrix-org/markjh/v2_sync_receipts (diff)
parentMerge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-... (diff)
downloadsynapse-7a5ea067e2e5470f6d1e0205a740fd9ea389531c.tar.xz
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions