Merge lp:~openerp-dev/openerp-web/7.0-sanitize-template-tde into lp:openerp-web/7.0
Proposed by
Thibault Delavallée (OpenERP)
Status: | Merged |
---|---|
Merged at revision: | 3663 |
Proposed branch: | lp:~openerp-dev/openerp-web/7.0-sanitize-template-tde |
Merge into: | lp:openerp-web/7.0 |
Diff against target: |
25 lines (+2/-2) 2 files modified
addons/web/static/lib/cleditor/jquery.cleditor.js (+1/-1) addons/web/static/src/js/view_form.js (+1/-1) |
To merge this branch: | bzr merge lp:~openerp-dev/openerp-web/7.0-sanitize-template-tde |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP R&D Web Team | Pending | ||
Review via email: mp+141269@code.launchpad.net |
Description of the change
[IMP] html_sanitize upgraded, allowing styling in html.
Web branch: cleditor does not uses custom fonts anymore.
To post a comment you must log in.