Merge branch 'master' into develop

public/openapi/components/schemas/CommonProps.yaml

@@ -68,6 +68,8 @@ CommonProps:
                     type: string
                   as:
                     type: string
+                  noEscape:
+                    type: boolean
                   crossorigin:
                     type: string
                     enum: ['', 'anonymous', 'use-credentials']

public/src/admin/extend/plugins.js

@@ -342,7 +342,7 @@ define('admin/extend/plugins', [
 
 	function populateUpgradeablePlugins() {
 		$('#installed ul li').each(function () {
-			if ($(this).children('[data-action="upgrade"]').length) {
+			if ($(this).find('[data-action="upgrade"]').length) {
 				$('#upgrade ul').append($(this).clone(true));
 			}
 		});