MantisBT: master 9bf1d34e

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2017-01-18 04:48 master-2.0.x f7ac340e
Changeset

Merge remote-tracking branch 'origin/master-1.3.x'

Conflicts:
library/README.md
mod - library/README.md Diff File
mod - library/phpmailer Diff File