diff options
| author | kali <kali@leap.se> | 2012-10-11 07:27:57 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-11 07:27:57 +0900 |
| commit | 5dbe01e4dd22fba66d9553c062b89ae9c3a39256 (patch) | |
| tree | 325a1753bde43170903d95320f3e440c145a3fff /tox.ini | |
| parent | 5c86e71493c433fbee49a3fdc8f8f3a537b3311e (diff) | |
| parent | a964b9e55a53b1d87d296e0f3b5295b0366c5967 (diff) | |
Merge branch 'feature/fix-crypted-keyring' into develop
This is a temporary workaround until we find a good solution
to issue #744.
Some old versions of python-keyring are causing a recursion loop.
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions