Merge remote-tracking branch 'origin/stable' into redesign

Browse Source

# Conflicts:
#	package-lock.json
#	package.json

...

This commit is contained in:

zadam

2021-05-26 21:27:06 +02:00

parent 58d61800f3 b9639bffce

commit 205f9953f9

7 changed files with 26 additions and 8 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

2

libraries/ckeditor/ckeditor.js vendored

File diff suppressed because one or more lines are too long

2

libraries/ckeditor/ckeditor.js.map

File diff suppressed because one or more lines are too long