summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-08-03 14:30:32 +0100
committerRichard van der Hoff <richard@matrix.org>2016-08-03 14:30:32 +0100
commit530bc862dc9bd9d3c9f567738e8b56df1146bc3b (patch)
treebd915629f8bc5a3a6568e1e1035d8dedf6dccae4 /res
parentMerge branch 'rav/refactor_device_query' into develop (diff)
parentPEP8 (diff)
downloadsynapse-530bc862dc9bd9d3c9f567738e8b56df1146bc3b.tar.xz
Merge branch 'rav/null_default_device_displayname' into develop
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions