MantisBT: master 4e35014d

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2017-03-21 15:32 master 4083855d
Changeset

Merge branch 'master-2.2'

Conflicts:
.gitignore
core/constant_inc.php
mod - doc/CREDITS Diff File
mod - docbook/Admin_Guide/en-US/Revision_History.xml Diff File
mod - docbook/Developers_Guide/en-US/Revision_History.xml Diff File