Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	src/services/ws.js
This commit is contained in:
zadam
2021-07-05 10:14:37 +02:00
4 changed files with 7 additions and 2 deletions

View File

@@ -166,6 +166,7 @@ const editorConfig = {
'IncludeNote',
'CutToNote',
'Mathematics',
'AutoformatMath',
'indentBlockShortcutPlugin',
'removeFormatLinksPlugin'
],