Merge branch '3.1.x'

* 3.1.x:
  [ticket/13684] Prevent horizontal resize of attach comment textarea

phpBB/styles/prosilver/theme/plupload.css

@@ -15,6 +15,11 @@
 	width: 30%;
 }
 
+.attach-comment .inputbox {
+	resize: vertical;
+	width: 100%;
+}
+
 .attach-filesize {
 	width: 15%;
 }