Merge pull request #152 from pixelgrade/release/v1.4.0

Release v1.4.0
pixelgrade · Apr 29, 2020 · e0a6917 · e0a6917
2 parents 2724850 + c762454
commit e0a6917
Show file tree

Hide file tree

Showing 62 changed files with 26,152 additions and 25,065 deletions.
diff --git a/dist/css/editor-rtl.css b/dist/css/editor-rtl.css
diff --git a/dist/css/editor.css b/dist/css/editor.css
diff --git a/dist/css/frontend-rtl.css b/dist/css/frontend-rtl.css
diff --git a/dist/css/frontend.css b/dist/css/frontend.css
diff --git a/dist/js/editor.js b/dist/js/editor.js
diff --git a/dist/js/editor.min.js b/dist/js/editor.min.js
diff --git a/dist/js/editor.min.js.LICENSE b/dist/js/editor.min.js.LICENSE
@@ -1,3 +1,60 @@
+<<<<<<< HEAD
+/*!
+  Copyright (c) 2017 Jed Watson.
+  Licensed under the MIT License (MIT), see
+  http://jedwatson.github.io/classnames
+*/
+
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/*!
+ * JavaScript Cookie v2.2.1
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+
+/** @license React v16.9.0
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.9.0
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v0.15.0
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.9.0
+ * react-dom-server.browser.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+=======
 /*!***************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/arrayWithHoles.js ***!
   \***************************************************************/
@@ -3927,3 +3984,4 @@
 /*!************************!*\
   !*** external "React" ***!
   \************************/
+>>>>>>> master
diff --git a/dist/js/editor.min.js.LICENSE.txt b/dist/js/editor.min.js.LICENSE.txt
@@ -10,6 +10,14 @@ object-assign
   http://jedwatson.github.io/classnames
 */
 
+/*!
+ * JavaScript Cookie v2.2.1
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+
 /** @license React v0.19.1
  * scheduler.production.min.js
  *