diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:14:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:57:03 +0100 |
| commit | c44caa428b65e85b034b01a7f6145e5fee60a863 (patch) | |
| tree | ab9e99da4400bf93cc2f512f10f1ebf66452fd80 /lib/stdlib/doc/src | |
| parent | e8ddbc58fda4ca07ff1f2f4d3c77ecae036ee513 (diff) | |
| parent | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (diff) | |
| download | otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.gz otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.bz2 otp-c44caa428b65e85b034b01a7f6145e5fee60a863.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_cipher_format.erl
lib/ssl/src/tls_handshake.erl
Diffstat (limited to 'lib/stdlib/doc/src')
| -rw-r--r-- | lib/stdlib/doc/src/proplists.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml index 9d7eb55a7e..4465103469 100644 --- a/lib/stdlib/doc/src/proplists.xml +++ b/lib/stdlib/doc/src/proplists.xml @@ -57,6 +57,11 @@ <datatype> <name name="property"/> </datatype> + + <datatype> + <name name="proplist"/> + </datatype> + </datatypes> <funcs> |