Merge branch 'master' into feature/collab-plugin

# Conflicts:
#	packages/tiptap/src/Editor.js
#	yarn.lock
This commit is contained in:
Philipp Kühn
2019-05-03 10:56:52 +02:00
36 changed files with 3679 additions and 3422 deletions

6433
yarn.lock

File diff suppressed because it is too large Load Diff