MantisBT: master 076ba46e

Author Committer Branch Timestamp Parent
dregad dregad master 2016-08-12 08:24 master 58cea8a0
Changeset

Merge branch '13x'

Conflicts:
core/html_api.php (resolved with change in layout_api.php)

mod - browser_search_plugin.php Diff File
mod - config_defaults_inc.php Diff File
mod - core/email_api.php Diff File
mod - core/layout_api.php Diff File
mod - core/string_api.php Diff File
mod - docbook/Admin_Guide/en-US/config/display.xml Diff File
mod - excel_xml_export.php Diff File
mod - lang/strings_english.txt Diff File