Merge branch 'main' into feature/react

# Conflicts:
#	yarn.lock
This commit is contained in:
Philipp Kühn
2021-03-08 18:10:21 +01:00
14 changed files with 138 additions and 73 deletions

View File

@@ -29,7 +29,7 @@
"tippy.js": "^6.3.1",
"vue-github-button": "^1.1.2",
"y-indexeddb": "^9.0.6",
"y-prosemirror": "^1.0.6",
"y-prosemirror": "^1.0.7",
"y-webrtc": "^10.1.7",
"y-websocket": "^1.3.11",
"yjs": "^13.5.1"