MantisBT: master 42c68716

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2015-04-18 19:59 master 605ef054
Changeset

Merge branch 'master' of git://github.com/mantisbt/mantisbt into modern-ui-2

Conflicts:

bug_report_page.php

core/html_api.php

manage_custom_field_edit_page.php
mod - billing_page.php Diff File
mod - bug_file_add.php Diff File
mod - bug_file_upload_inc.php Diff File
mod - bug_report.php Diff File
mod - bug_update.php Diff File
mod - bugnote_add.php Diff File
mod - bugnote_add_inc.php Diff File
mod - config/config_inc.php.sample Diff File
mod - config_defaults_inc.php Diff File
add - core/antispam_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/bugnote_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/custom_field_api.php Diff File
mod - core/database_api.php Diff File
mod - core/email_api.php Diff File
mod - core/error_api.php Diff File
mod - core/file_api.php Diff File
mod - core/history_api.php Diff File
mod - core/ldap_api.php Diff File
mod - core/print_api.php Diff File
mod - core/project_api.php Diff File
mod - core/tag_api.php Diff File
mod - docbook/Admin_Guide/en-US/Configuration.xml Diff File
add - docbook/Admin_Guide/en-US/config/antispam.xml Diff File
mod - docbook/Admin_Guide/en-US/config/auth.xml Diff File
mod - docbook/Admin_Guide/en-US/config/email.xml Diff File
add - javascript/manage_custom_field_edit_page.js Diff File
mod - lang/strings_english.txt Diff File
mod - library/README.libs Diff File
mod - library/phpmailer Diff File
mod - library/securimage Diff File
mod - manage_custom_field_edit_page.php Diff File