summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-22 10:18:30 +0000
committerErik Johnston <erik@matrix.org>2016-11-22 10:18:30 +0000
commit2bbc4cab604aa649cc114fac0ebdbfa42b35a674 (patch)
tree2def351407d8973c52e30863f404e7c62287d4d4 /res
parentBump changelog and version (diff)
parentFix flake8 (diff)
downloadsynapse-2bbc4cab604aa649cc114fac0ebdbfa42b35a674.tar.xz
Merge branch 'dbkr/work_around_devicename_bug' of github.com:matrix-org/synapse into release-v0.18.4
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions