MantisBT: master 8daee923

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-09-10 23:31 master 1f8e3b70
Changeset

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

Conflicts:

  • css/default.css - change discarded
  • manage_config_workflow_page.php - merged
mod - bug_report_page.php Diff File
mod - core/csv_api.php Diff File
mod - core/email_api.php Diff File
mod - core/excel_api.php Diff File
mod - core/helper_api.php Diff File
mod - manage_config_workflow_page.php Diff File
mod - manage_config_workflow_set.php Diff File