summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-05 13:58:19 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-05 13:58:19 +0000
commitbd85434cb398a8272a1276574db4d28dc76f7f3f (patch)
treebbecac7c1e86ba5a863f1a36fb7f9d9a1a9c6d7d /res
parentMerge branch 'release-v0.18.6' into develop (diff)
parentFix flake8 and update changelog (diff)
downloadsynapse-bd85434cb398a8272a1276574db4d28dc76f7f3f.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions