aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server/httpd_esi.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-04-04 16:35:37 +0200
committerHenrik Nord <[email protected]>2016-04-04 16:35:37 +0200
commit6da1d0cb1f7e83163dbcec64a59b88e13616b2f1 (patch)
tree95803ea1ffadf0de943ad52b05b24423908ef803 /lib/inets/src/http_server/httpd_esi.erl
parent85ff1664e78e5a17f478911ae52582c073f085ea (diff)
parentafe72bfc1448ff426c38eceb7412f69e973aef62 (diff)
downloadotp-6da1d0cb1f7e83163dbcec64a59b88e13616b2f1.tar.gz
otp-6da1d0cb1f7e83163dbcec64a59b88e13616b2f1.tar.bz2
otp-6da1d0cb1f7e83163dbcec64a59b88e13616b2f1.zip
Merge tag 'OTP-18.3.1'
=== OTP-18.3.1 === Changed Applications: - erts-7.3.1 - inets-6.2.1 - mnesia-4.13.4 Unchanged Applications: - asn1-4.0.2 - common_test-1.12 - compiler-6.0.3 - cosEvent-2.2 - cosEventDomain-1.2 - cosFileTransfer-1.2 - cosNotification-1.2.1 - cosProperty-1.2 - cosTime-1.2.1 - cosTransactions-1.3.1 - crypto-3.6.3 - debugger-4.1.2 - dialyzer-2.9 - diameter-1.11.2 - edoc-0.7.18 - eldap-1.2.1 - erl_docgen-0.4.2 - erl_interface-3.8.2 - et-1.5.1 - eunit-2.2.13 - gs-1.6 - hipe-3.15 - ic-4.4 - jinterface-1.6.1 - kernel-4.2 - megaco-3.18 - observer-2.1.2 - odbc-2.11.1 - orber-3.8.1 - os_mon-2.4 - ose-1.1 - otp_mibs-1.1 - parsetools-2.1.1 - percept-0.8.11 - public_key-1.1.1 - reltool-0.7 - runtime_tools-1.9.3 - sasl-2.7 - snmp-5.2.2 - ssh-4.2.2 - ssl-7.3 - stdlib-2.8 - syntax_tools-1.7 - test_server-3.10 - tools-2.8.3 - typer-0.9.10 - webtool-0.9.1 - wx-1.6.1 - xmerl-1.3.10 Conflicts: OTP_VERSION erts/emulator/test/save_calls_SUITE.erl erts/vsn.mk
Diffstat (limited to 'lib/inets/src/http_server/httpd_esi.erl')
0 files changed, 0 insertions, 0 deletions