Merge branch 'master' into feature/suggestions

Browse Source

# Conflicts:
#	packages/tiptap-extensions/package.json

...

This commit is contained in:

Philipp Kühn

2018-09-04 23:12:00 +02:00

parent c716fe605f 518413e33f

commit 0e3810bca0

24 changed files with 1045 additions and 652 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

1195

yarn.lock

File diff suppressed because it is too large Load Diff