Merge branch 'master' into feature/collab-plugin

Browse Source

# Conflicts:
#	packages/tiptap/src/Editor.js
#	yarn.lock

...

This commit is contained in:

Philipp Kühn

2019-05-03 10:56:52 +02:00

parent ac3b95716e 0e59e0cc0c

commit 83075f28e6

36 changed files with 3679 additions and 3422 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6433

yarn.lock

File diff suppressed because it is too large Load Diff