summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-01-29 14:15:12 +0000
committerMark Haines <mark.haines@matrix.org>2016-01-29 14:15:12 +0000
commit47374a33fc195bf44363006070268fd60ffff047 (patch)
treeea2931512014f5f7361bee5c7f768506adbf783a /tox.ini
parentAdd config option for setting the trusted id servers, disabling checking the ... (diff)
parentBump AccountDataAndTagsChangeCache size (diff)
downloadsynapse-47374a33fc195bf44363006070268fd60ffff047.tar.xz
Merge remote-tracking branch 'origin/develop' into markjh/3pid
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions