aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-08-30 17:33:33 +0200
committerIngela Anderton Andin <[email protected]>2018-08-30 17:40:42 +0200
commit572fed38106ccd490352bceb3fcecb34f33f9e18 (patch)
tree23b570b5dab57b14cebbd28a1590f3068f07ec49 /.gitattributes
parent72f64e28866815f7621119997e02455e751d7d53 (diff)
parent96aa684ffcae8f70898aa6b924fa82804d537488 (diff)
downloadotp-572fed38106ccd490352bceb3fcecb34f33f9e18.tar.gz
otp-572fed38106ccd490352bceb3fcecb34f33f9e18.tar.bz2
otp-572fed38106ccd490352bceb3fcecb34f33f9e18.zip
Merge branch 'maint'
Conflicts: lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions