MantisBT: master 0f93b5e6

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-08-12 15:41 master 4665ccca
Changeset

Merge branch 'master-1.3.x'

Conflicts:
core/html_api.php (resolved with change in layout_api.php)
css/admin.css (deleted)
mod - admin/check/check_api.php Diff File
mod - admin/check/check_attachments_inc.php Diff File
mod - admin/check/check_display_inc.php Diff File
mod - admin/check/check_php_inc.php Diff File
mod - core/layout_api.php Diff File