MantisBT: master 8f8f351b

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-10-19 08:01 master a77e6760
Changeset

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

Conflicts:
config_defaults_inc.php
core/constant_inc.php
doc/CREDITS
mod - account_update.php Diff File
mod - config_defaults_inc.php Diff File
mod - core/email_api.php Diff File
mod - core/error_api.php Diff File
mod - doc/CREDITS Diff File
mod - docbook/Admin_Guide/en-US/Revision_History.xml Diff File
mod - docbook/Admin_Guide/en-US/config/fields.xml Diff File
mod - docbook/Developers_Guide/en-US/Plugins_Building.xml Diff File
mod - docbook/Developers_Guide/en-US/Revision_History.xml Diff File
mod - manage_user_edit_page.php Diff File