Merge remote-tracking branch 'origin/7.1' into 7.2

# Conflicts: # lerna.json # packages/babel-preset-neos-ui/package.json # packages/build-essentials/package.json # packages/debug-reason-for-rendering/package.json # packages/jest-preset-neos-ui/package.json # packages/neos-ts-interfaces/package.json # packages/neos-ui-backend-connector/package.json # packages/neos-ui-ckeditor-bindings/package.json # packages/neos-ui-ckeditor5-bindings/package.json # packages/neos-ui-constants/package.json # packages/neos-ui-containers/package.json # packages/neos-ui-contentrepository/package.json # packages/neos-ui-decorators/package.json # packages/neos-ui-editors/package.json # packages/neos-ui-extensibility/package.json # packages/neos-ui-guest-frame/package.json # packages/neos-ui-i18n/package.json # packages/neos-ui-inspector/package.json # packages/neos-ui-redux-store/package.json # packages/neos-ui-sagas/package.json # packages/neos-ui-validators/package.json # packages/neos-ui-views/package.json # packages/neos-ui/package.json # packages/positional-array-sorter/package.json # packages/react-proptypes/package.json # packages/react-ui-components/package.json # packages/utils-helpers/package.json # packages/utils-helpers/src/getVersion.ts # packages/utils-logger/package.json # packages/utils-redux/package.json
neos · Mar 21, 2022 · 37061bb · 37061bb
2 parents 5c7b891 + b4ab1ef
commit 37061bb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Resources/Public/JavaScript/Host.js.LICENSE b/Resources/Public/JavaScript/Host.js.LICENSE
@@ -49,6 +49,11 @@ and limitations under the License.
                                                                                                                                                                                                      * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
                                                                                                                                                                                                      */
 
+/**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                */
+
 /**
  * @license
  * Lodash <https://lodash.com/>
@@ -58,11 +63,6 @@ and limitations under the License.
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
 
-/**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                */
-
 /*
 object-assign
 (c) Sindre Sorhus