diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 18:37:39 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 18:37:39 +0100 |
| commit | f39147b4c35dd06f48eba0a446dd6881aa46c917 (patch) | |
| tree | 62e15d94df972eb25b2603c97940a7f0cf3c5230 /lib/kernel | |
| parent | f4b5ea566829cad609e14c2264158665b84800c1 (diff) | |
| parent | ffb2d69e00ef283eeb266f3082067429b6ce1127 (diff) | |
| download | otp-f39147b4c35dd06f48eba0a446dd6881aa46c917.tar.gz otp-f39147b4c35dd06f48eba0a446dd6881aa46c917.tar.bz2 otp-f39147b4c35dd06f48eba0a446dd6881aa46c917.zip | |
Merge branch 'bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/kernel')
0 files changed, 0 insertions, 0 deletions