MantisBT: master 1cb9d6c2

Diff Back to Repository
Author Committer Branch Timestamp Parent
vboctor vboctor master 2016-10-22 21:51 master 5b730648
Changeset

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

Conflicts:

core/constant_inc.php
mod - core/bug_api.php Diff File
mod - core/bugnote_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/string_api.php Diff File
mod - core/summary_api.php Diff File
mod - docbook/Admin_Guide/en-US/Customizing.xml Diff File
mod - docbook/Admin_Guide/en-US/Installation.xml Diff File
mod - my_view_inc.php Diff File
mod - plugins/Gravatar/Gravatar.php Diff File