summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-25 16:37:59 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-25 16:37:59 +0100
commit460cad7c11f8d2595afba1116c4a32bb3d73f557 (patch)
tree2f7c88a4e65be53624484622b32751b513db711d /tox.ini
parentStop looking up "admin", which we never read (diff)
parentFix up one more reference (diff)
downloadsynapse-460cad7c11f8d2595afba1116c4a32bb3d73f557.tar.xz
Merge branch 'deviceid' into removeadmin
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions