diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:54:01 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:54:01 +0200 |
| commit | 7a04ee7dd3fad10e30581d22956234aeff2b2f3a (patch) | |
| tree | 99770ff5bebd0816fd74e830e4308276b960dc9f /unittest/conftest.py | |
| parent | 8f7435e4553916e6cc431e4b5316cc5861fd9063 (diff) | |
| parent | a83419fe4a13bc77005d455dd89685b8c1443d96 (diff) | |
| download | libnitrokey-7a04ee7dd3fad10e30581d22956234aeff2b2f3a.tar.gz libnitrokey-7a04ee7dd3fad10e30581d22956234aeff2b2f3a.tar.bz2 | |
Merge branch 'osx-communication_issues' into OSX_merge_cleaned
Diffstat (limited to 'unittest/conftest.py')
0 files changed, 0 insertions, 0 deletions