Merge remote-tracking branch 'origin/stable'

Browse Source

# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map

...

This commit is contained in:

zadam

2020-06-20 09:40:11 +02:00

parent ffc96ad6b2 2af2b45062

commit 30062d687f

5 changed files with 7 additions and 3 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