aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-03-04 11:57:14 +0100
committerRaimo Niskanen <[email protected]>2019-03-04 11:57:14 +0100
commitdf25e742f1ab87f8dbb290eed8e24ec919c3780a (patch)
tree3c1e9f7110591dc83345fe098304770fc6719964 /make
parentfec6e81808d654d901ca7512dfcccd4894f86548 (diff)
parent73587632918cefc05d4112db74548b6770b35f9c (diff)
downloadotp-df25e742f1ab87f8dbb290eed8e24ec919c3780a.tar.gz
otp-df25e742f1ab87f8dbb290eed8e24ec919c3780a.tar.bz2
otp-df25e742f1ab87f8dbb290eed8e24ec919c3780a.zip
Merge branch 'essen/ssl-active-n' into maint
* essen/ssl-active-n: fixup! ssl: Add support for {active,N} ssl: Use common fonction to update {active,N} ssl: Document {active,N} ssl: Add support for {active,N} Conflicts: lib/ssl/src/ssl.erl
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions