diff options
author | Henrik Nord <[email protected]> | 2016-06-14 10:21:38 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2016-06-14 10:21:38 +0200 |
commit | 0c8357d15dd2573331056a308e3744927ce406ad (patch) | |
tree | 6b119202c4c879c797d7a792ae1dedab183a5d73 /lib/inets/doc | |
parent | 64515dcead288dacf4876eb0502c755f08427977 (diff) | |
parent | 53e7743216647d810d529e397bd3ea7278c6047c (diff) | |
download | otp-0c8357d15dd2573331056a308e3744927ce406ad.tar.gz otp-0c8357d15dd2573331056a308e3744927ce406ad.tar.bz2 otp-0c8357d15dd2573331056a308e3744927ce406ad.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
lib/inets/vsn.mk
lib/ssl/test/ssl_basic_SUITE.erl
lib/ssl/vsn.mk
Diffstat (limited to 'lib/inets/doc')
-rw-r--r-- | lib/inets/doc/src/notes.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 5cebce18a9..ab2cc5ab21 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,22 @@ <file>notes.xml</file> </header> - <section><title>Inets 6.2.3</title> + <section><title>Inets 6.2.4</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Handle multiple \t in mime types file</p> + <p> + Own Id: OTP-13663 Aux Id: seq13132 </p> + </item> + </list> + </section> + +</section> + +<section><title>Inets 6.2.3</title> <section><title>Improvements and New Features</title> <list> |