aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-18 09:25:11 +0200
committerIngela Anderton Andin <[email protected]>2015-09-18 09:25:11 +0200
commit9b01223a5ff7e157c57ef832afc985662c97e123 (patch)
treea6a8ba108259e256c73f814bfec70d030128789d /.gitattributes
parentb5fc65bb0a959bd96c125ce523c41052bbc0c04d (diff)
parent85276c69d9bf43ac85b4de3aacfc5f9baf15bcf0 (diff)
downloadotp-9b01223a5ff7e157c57ef832afc985662c97e123.tar.gz
otp-9b01223a5ff7e157c57ef832afc985662c97e123.tar.bz2
otp-9b01223a5ff7e157c57ef832afc985662c97e123.zip
Merge branch 'ia/ssl/cuddle_tests' into maint
* ia/ssl/cuddle_tests: ssl: Timeout tuning
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions