Merge branch 'master' into feature/suggestions

# Conflicts:
#	examples/Components/App/style.scss
#	examples/Components/Subnavigation/index.vue
#	examples/main.js
#	packages/tiptap-extensions/package.json
This commit is contained in:
Philipp Kühn
2018-09-24 15:44:42 +02:00
30 changed files with 567 additions and 162 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "tiptap-extensions",
"version": "0.8.0",
"version": "0.14.1",
"description": "Extensions for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"license": "MIT",
@@ -8,6 +8,7 @@
"module": "dist/extensions.esm.js",
"unpkg": "dist/extensions.js",
"jsdelivr": "dist/extensions.js",
"sideEffects": false,
"files": [
"src",
"dist"
@@ -24,7 +25,7 @@
"prosemirror-history": "^1.0.2",
"prosemirror-state": "^1.2.2",
"prosemirror-view": "^1.5.1",
"tiptap": "^0.10.0",
"tiptap": "^0.12.1",
"tiptap-commands": "^0.3.0"
}
}