MantisBT: master 5884ba47

Author Committer Branch Timestamp Parent
dregad dregad master 2017-08-01 09:16:04 master 3fa9f5d6
Changeset

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

Conflicts:

core/constant_inc.php

mod - admin/install.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 - manage_user_page.php Diff File