diff options
| author | Hans Nilsson <[email protected]> | 2016-10-11 16:01:24 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-10-11 16:01:24 +0200 |
| commit | fec3e5165d2583969770114cc14d0e39a422d61a (patch) | |
| tree | f6e8dff23a24e3ba32a05af739ef28220aecd6ca /lib/crypto/doc/src/usersguide.xml | |
| parent | 301c8e78a1445c0d0080fdb758a3b9e8140fb626 (diff) | |
| parent | 0411d5492319a5bc555247a3f783aaa421b4f31c (diff) | |
| download | otp-fec3e5165d2583969770114cc14d0e39a422d61a.tar.gz otp-fec3e5165d2583969770114cc14d0e39a422d61a.tar.bz2 otp-fec3e5165d2583969770114cc14d0e39a422d61a.zip | |
Merge branch 'legoscia/ssl_in_fips_mode/PR-1180/OTP-13921'
Conflicts:
lib/crypto/c_src/crypto.c
lib/ssl/src/ssl_cipher.erl
Diffstat (limited to 'lib/crypto/doc/src/usersguide.xml')
| -rw-r--r-- | lib/crypto/doc/src/usersguide.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/crypto/doc/src/usersguide.xml b/lib/crypto/doc/src/usersguide.xml index fb088a8285..7971aefff4 100644 --- a/lib/crypto/doc/src/usersguide.xml +++ b/lib/crypto/doc/src/usersguide.xml @@ -47,5 +47,6 @@ </p> </description> <xi:include href="licenses.xml"/> + <xi:include href="fips.xml"/> </part> |