diff options
| author | Lukas Larsson <[email protected]> | 2012-03-09 11:16:07 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-03-09 11:16:07 +0100 |
| commit | 23b971babc42752c1bc0130df3e044ab69a6e43e (patch) | |
| tree | 441764ba22cbedbd3c0ea2de1caf54ed11deec66 /erts | |
| parent | 914fc0635ec8f74a546e242f9a6ee40d06c9df09 (diff) | |
| parent | 91de0b23d35782b2059faa7323744138eb5545f8 (diff) | |
| download | otp-23b971babc42752c1bc0130df3e044ab69a6e43e.tar.gz otp-23b971babc42752c1bc0130df3e044ab69a6e43e.tar.bz2 otp-23b971babc42752c1bc0130df3e044ab69a6e43e.zip | |
Merge branch 'maint'
* maint:
Add so that <img> tags will be transformed to <image>
Allow 1..2 types to be exported from edoc
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions