Merge remote-tracking branch 'origin/stable'

Browse Source

# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/widgets/type_widgets/editable_text.js

...

This commit is contained in:

zadam

2020-06-03 16:25:45 +02:00

parent e68aed2057 7307ca385f

commit 915b1d1a45

24 changed files with 295 additions and 225 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