MantisBT: master f1ea5ab0

Author Committer Branch Timestamp Parent
dregad dregad master 2017-03-20 06:18 master cd36fcee
Changeset

Merge branch 'master-2.2'

Conflicts:
core/constant_inc.php

mod - adm_config_report.php Diff File
mod - adm_config_set.php Diff File
mod - admin/install.php Diff File
mod - core/constant_inc.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