diff options
| author | Steven Hammerton <steven.hammerton@openmarket.com> | 2015-11-17 10:55:41 +0000 |
|---|---|---|
| committer | Steven Hammerton <steven.hammerton@openmarket.com> | 2015-11-17 10:55:41 +0000 |
| commit | f5e25c5f358de93f8bbba83496a44cf217ce086a (patch) | |
| tree | c01c8462aa3a004e103de4befc45b7f9206439b1 /tox.ini | |
| parent | Snakes not camels (diff) | |
| parent | Merge pull request #376 from matrix-org/daniel/jenkins (diff) | |
| download | synapse-f5e25c5f358de93f8bbba83496a44cf217ce086a.tar.xz | |
Merge branch 'develop' into sh-cas-auth-via-homeserver
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini |