diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 20:21:12 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 20:21:12 -0700 |
commit | 3262843dcab0969b28ec5798810b6db273a5f102 (patch) | |
tree | f7841c47ec115fa96db86f3c015f176b22a82b3c /tox.ini | |
parent | bf2625109700470e9a1b4022220219da10179527 (diff) | |
parent | 69b995a342b32744d1f340e14ec8841e8fb8a51e (diff) |
Merge remote-tracking branch 'alex/switch-to-cryptography' into 394-int
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions