MantisBT: master 75b1701f

Diff Back to Repository
Author Committer Branch Timestamp Parent
vboctor vboctor master 2017-02-26 15:35 master cfd9723e
Changeset

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

Conflicts:

core/constant_inc.php
mod - docbook/Admin_Guide/en-US/Revision_History.xml Diff File
mod - docbook/Developers_Guide/en-US/Revision_History.xml Diff File