diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-11 10:40:45 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-11 10:40:45 +0100 |
| commit | c4bc990faf26a665e634362a046de2adbc37feee (patch) | |
| tree | e15198766b2bb7b7a09ee48659cdbd6d0d348ee3 /.gitattributes | |
| parent | 69cbf64e5a948064e0503590c8c42443f3405ad0 (diff) | |
| parent | a609e31025b2b93d5d360879193eb6f1dac90d51 (diff) | |
| download | otp-c4bc990faf26a665e634362a046de2adbc37feee.tar.gz otp-c4bc990faf26a665e634362a046de2adbc37feee.tar.bz2 otp-c4bc990faf26a665e634362a046de2adbc37feee.zip | |
Merge branch 'ia/ssl/windows-tests' into maint
* ia/ssl/windows-tests:
ssl: Use test case time out instead
ssl: Use spawn_executable
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions