diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-01-29 14:15:12 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-01-29 14:15:12 +0000 |
commit | 47374a33fc195bf44363006070268fd60ffff047 (patch) | |
tree | ea2931512014f5f7361bee5c7f768506adbf783a /tox.ini | |
parent | Add config option for setting the trusted id servers, disabling checking the ... (diff) | |
parent | Bump AccountDataAndTagsChangeCache size (diff) | |
download | synapse-47374a33fc195bf44363006070268fd60ffff047.tar.xz |
Merge remote-tracking branch 'origin/develop' into markjh/3pid
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions