Philipp Kühn 83075f28e6 Merge branch 'master' into feature/collab-plugin ...

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

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

..

assets

fix caret color for safari, fix #167

2019-01-19 10:04:47 +01:00

Components

Merge branch 'master' into feature/collab-plugin

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

helpers

tabs to spaces whitespace

2018-11-08 22:03:10 +01:00

index.html

tabs to spaces whitespace

2018-11-08 22:03:10 +01:00

main.js

add new collab test

2019-02-06 10:33:16 +01:00