summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-08 14:43:49 +0000
committerErik Johnston <erik@matrix.org>2016-11-08 14:43:49 +0000
commite6651e804693edd575370157ab3fef08d6952186 (patch)
tree5eec467445186c011b2c1a6f083d9d852f51f869 /tox.ini
parentMerge pull request #1615 from matrix-org/erikj/limit_prev_events (diff)
parentMerge branch 'erikj/ldap3_auth' (diff)
downloadsynapse-e6651e804693edd575370157ab3fef08d6952186.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions