MantisBT: master c8fe307b

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-08-17 03:12 master 44bb87ce
Changeset

Merge branch 'master-1.3.x'

Conflicts:
core/html_api.php (resolved with change in layout_api.php)
mod - core/email_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/history_api.php Diff File
mod - core/layout_api.php Diff File
mod - core/timeline_api.php Diff File
mod - csv_export.php Diff File
mod - excel_xml_export.php Diff File