summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-05 11:15:48 +0100
committerErik Johnston <erik@matrix.org>2016-08-05 11:15:48 +0100
commit499dc1b349988e23ab26f829b2005f617134e6c0 (patch)
tree866dec5ab910b42fd22b5826721c0ec7f8ad7cff /res
parentBump version and changelog (diff)
parentMerge pull request #986 from matrix-org/erikj/state (diff)
downloadsynapse-499dc1b349988e23ab26f829b2005f617134e6c0.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions