MantisBT: master-2.2 75ef0783

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master-2.2 2017-03-01 08:17 master b77f7b57
Changeset

Merge remote-tracking branch 'origin/master-1.3.x'

Conflicts:
core/constant_inc.php
docbook/Admin_Guide/en-US/Revision_History.xml
docbook/Developers_Guide/en-US/Revision_History.xml
print_all_bug_page_word.php
mod - docbook/Admin_Guide/en-US/Customizing.xml Diff File
mod - docbook/Admin_Guide/en-US/Page_Descriptions.xml Diff File
mod - docbook/Admin_Guide/en-US/config/email.xml Diff File