Philipp Kühn 0e3810bca0 Merge branch 'master' into feature/suggestions ...

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

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

..

extensions

move history plugin to extension package

2018-08-25 21:33:06 +02:00

marks

fix em input rule

2018-08-27 21:53:12 +02:00

nodes

Merge branch 'master' into feature/suggestions

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

plugins

add prosemirror-suggestions

2018-09-01 20:51:17 +02:00

index.js

Merge branch 'master' into feature/suggestions

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