MantisBT: master ae13b5e2

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-12-26 03:36 master 20cbdfd4
Changeset

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

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