Merge branch 'MDL-65776-311' of git://github.com/sarjona/moodle into …

…MOODLE_311_STABLE
moodle · Mar 25, 2021 · 4c9a7df · 4c9a7df
2 parents dc6079c + e2585ce
commit 4c9a7df
Show file tree

Hide file tree

Showing 9 changed files with 23,513 additions and 12,602 deletions.
diff --git a/lib/editor/atto/plugins/html/thirdpartylibs.xml b/lib/editor/atto/plugins/html/thirdpartylibs.xml
@@ -11,7 +11,7 @@
     <location>yui/src/beautify</location>
     <name>jsbeautify</name>
     <license>MIT</license>
-    <version>1.7.5</version>
+    <version>1.13.0</version>
     <licenseversion></licenseversion>
   </library>
 </libraries>
diff --git a/.../atto/plugins/html/yui/build/moodle-atto_html-beautify/moodle-atto_html-beautify-debug.js b/.../atto/plugins/html/yui/build/moodle-atto_html-beautify/moodle-atto_html-beautify-debug.js
diff --git a/...or/atto/plugins/html/yui/build/moodle-atto_html-beautify/moodle-atto_html-beautify-min.js b/...or/atto/plugins/html/yui/build/moodle-atto_html-beautify/moodle-atto_html-beautify-min.js
diff --git a/...editor/atto/plugins/html/yui/build/moodle-atto_html-beautify/moodle-atto_html-beautify.js b/...editor/atto/plugins/html/yui/build/moodle-atto_html-beautify/moodle-atto_html-beautify.js
diff --git a/lib/editor/atto/plugins/html/yui/src/beautify/LICENSE b/lib/editor/atto/plugins/html/yui/src/beautify/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2007-2013 Einar Lielmanis and contributors.
+Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: