Merge branch 'master' into release.1.6

This commit is contained in:
Peter Savchenko 2017-04-25 03:47:43 +03:00
commit b009799e65
4 changed files with 5 additions and 10 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -36,12 +36,7 @@ module.exports = (function (sanitizer) {
href: true, href: true,
target: '_blank', target: '_blank',
rel: 'nofollow' rel: 'nofollow'
}, }
i: {},
b: {},
strong: {},
em: {},
span: {}
} }
} }
}; };

View file

@ -1,6 +1,6 @@
{ {
"name": "codex.editor", "name": "codex.editor",
"version": "1.6.5", "version": "1.6.6",
"description": "Codex Editor. Native JS, based on API and Open Source", "description": "Codex Editor. Native JS, based on API and Open Source",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {