Merge remote-tracking branch 'origin/master'

xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml

@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.xwiki.platform</groupId>
-    <artifactId>xwiki-platform-legacy</artifactId>
+    <artifactId>xwiki-platform-legacy-rendering-macros</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-macro-include</artifactId>

xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/src/main/resources/ExtensionCode/SkinExtension.xml

@@ -236,7 +236,6 @@
   padding: 0 1em 0.5em;
   min-height: 100px;
   vertical-align: top;
-  width: 350px;
 }
 
 .extension-link form {