merge develop and resolve conflicts

Author: DavidCramer

.eslintrc.json

@@ -16,6 +16,7 @@
   "rules": {
     "no-alert": "off",
     "no-console": "off",
+    "no-unused-vars": "off",
     "no-nested-ternary": "off",
     "jsx-a11y/click-events-have-key-events": "off",
     "react-hooks/rules-of-hooks": "error",

.stylelintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "selector-class-pattern": null
+  }
+}

assets/screenshot-5.png

@@ -3,7 +3,7 @@
  * Plugin Name: Cloudinary
  * Plugin URI: https://cloudinary.com/documentation/wordpress_integration
  * Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
- * Version: 2.5.0-build-201208.01
+ * Version: 2.5.0
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

assets/screenshot-6.png

@@ -3,7 +3,9 @@
 	"homepage": "https://wordpress.org/plugins/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/",
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
-	"require": {},
+	"require": {
+      "ext-json": "*"
+    },
 	"require-dev": {
 		"wp-coding-standards/wpcs": "^2.3",
 		"automattic/vipwpcs": "^2.2",