Merge branch 'master-2.24'

# Conflicts: # composer.lock # core/constant_inc.php
mantisbt · Jun 3, 2020 · f9a4340 · f9a4340
2 parents b1d78e7 + 2fc6661
commit f9a4340
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/composer.lock b/composer.lock
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.24-1</revnumber>
+				<date>Sun May 3 2020</date>
+				<author>
+					<firstname>Victor</firstname>
+					<surname>Boctor</surname>
+					<email>vboctor@mantisbt.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member>Release 2.24.1</member>
+					</simplelist>
+				</revdescription>
+			</revision>
 			<revision>
 				<revnumber>2.24-0</revnumber>
 				<date>Sun Mar 15 2020</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.24-1</revnumber>
+				<date>Sun May 3 2020</date>
+				<author>
+					<firstname>Victor</firstname>
+					<surname>Boctor</surname>
+					<email>vboctor@mantisbt.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member>Release 2.24.1</member>
+					</simplelist>
+				</revdescription>
+			</revision>
 			<revision>
 				<revnumber>2.24-0</revnumber>
 				<date>Sun Mar 15 2020</date>