MantisBT: master 0464b121

Author Committer Branch Timestamp Parent
dregad dregad master 2016-12-28 07:46 master ae13b5e2
Changeset

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

Conflicts:
library/README.md

mod - core/tag_api.php Diff File
mod - library/README.md Diff File
mod - library/phpmailer Diff File