MantisBT: master bbd10c36

Author Committer Branch Timestamp Parent
dregad dregad master 2017-01-18 04:50 master 99fd9e29
Changeset

Merge branch 'master-2.0.x'

Conflicts:
library/README.md

mod - admin/install.php Diff File
mod - docbook/Admin_Guide/en-US/Installation.xml Diff File
mod - docbook/Admin_Guide/en-US/config/database.xml Diff File
mod - library/README.md Diff File
mod - library/phpmailer Diff File