MantisBT: master 13a7de43

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2017-05-22 02:09 master 6f7ea152
Changeset

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

Conflicts:
core/constant_inc.php
mod - core/cfdefs/cfdef_standard.php Diff File
mod - core/classes/MantisColumn.class.php Diff File
mod - core/csv_api.php Diff File
mod - core/custom_field_api.php Diff File
mod - core/excel_api.php Diff File
mod - csv_export.php Diff File
mod - docbook/Admin_Guide/en-US/Revision_History.xml Diff File
mod - docbook/Developers_Guide/en-US/Revision_History.xml Diff File
mod - excel_xml_export.php Diff File