diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-14 16:30:29 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-14 16:30:29 -0300 |
| commit | d2893b4ad78a573bb0cdc001530d40b6c5f7dd01 (patch) | |
| tree | b2454ae8a7df84b1a2be50ac94bb2247f57f684c /tox.ini | |
| parent | 65eff7efadec6a88d3f55bbd3f6448f3dd5e7641 (diff) | |
| parent | 07600853819d65959e9e2c9b96d62578442d3ae0 (diff) | |
Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions