Merge branch 'master' into paragraph-parser-algorythm

# Conflicts:
#	codex-editor.js.map
#	whatwg-fetch.js.map
This commit is contained in:
khaydarov 2017-01-30 19:57:52 +03:00
parent 119f7b7ec7
commit bb7aaee8e3
4 changed files with 4 additions and 4 deletions

View file

@ -88,7 +88,7 @@ var codex =
codex.sanitizer = __webpack_require__(18); codex.sanitizer = __webpack_require__(18);
}; };
codex.version = ("1.3.09"); codex.version = ("1.3.10");
/** /**
* @public * @public

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{ {
"name": "codex.editor", "name": "codex.editor",
"version": "1.3.09", "version": "1.3.10",
"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": {

File diff suppressed because one or more lines are too long