Merge remote-tracking branch 'origin/master-2.22'

mantisbt · Nov 13, 2019 · 812f55a · 812f55a
2 parents 9c62457 + 9b0dce2
commit 812f55a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/docbook/Admin_Guide/en-US/Revision_History.xml b/docbook/Admin_Guide/en-US/Revision_History.xml
@@ -5,6 +5,20 @@
 	<title>Revision History</title>
 	<simpara>
 		<revhistory>
+			<revision>
+				<revnumber>2.22-1</revnumber>
+				<date>Thu Sep 26 2019</date>
+				<author>
+					<firstname>Victor</firstname>
+					<surname>Boctor</surname>
+					<email>vboctor@mantisbt.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member>Release 2.22.1</member>
+					</simplelist>
+				</revdescription>
+			</revision>
 			<revision>
 				<revnumber>2.22-0</revnumber>
 				<date>Sun Aug 25 2019</date>

diff --git a/docbook/Developers_Guide/en-US/Revision_History.xml b/docbook/Developers_Guide/en-US/Revision_History.xml
@@ -7,6 +7,20 @@
 	<title>Revision History</title>
 	<simpara>
 		<revhistory>
+			<revision>
+				<revnumber>2.22-1</revnumber>
+				<date>Thu Sep 26 2019</date>
+				<author>
+					<firstname>Victor</firstname>
+					<surname>Boctor</surname>
+					<email>vboctor@mantisbt.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member>Release 2.22.1</member>
+					</simplelist>
+				</revdescription>
+			</revision>
 			<revision>
 				<revnumber>2.22-0</revnumber>
 				<date>Sun Aug 25 2019</date>

diff --git a/manage_columns_inc.php b/manage_columns_inc.php
@@ -154,8 +154,8 @@
 				</td>
 				<td>
 					<textarea class="form-control" id="excel-columns" <?php echo helper_get_tab_index() ?> name="excel_columns" cols="80" rows="5">
-						<?php echo $t_excel ?>
-					</textarea>
+<?php echo $t_excel ?>
+</textarea>
 				</td>
 			</tr>
 		</fieldset>