MantisBT: master edbdddf1

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2014-08-31 17:23 master 7f2b1242
Changeset

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

Conflicts:
admin/index.php
admin/test_icons.php
mod - account_prefs_inc.php Diff File
mod - adm_config_report.php Diff File
mod - admin/check/check_attachments_inc.php Diff File
mod - admin/check/check_database_inc.php Diff File
mod - admin/move_attachments_page.php Diff File
mod - api/soap/mc_api.php Diff File
mod - api/soap/mc_file_api.php Diff File
mod - api/soap/mc_project_api.php Diff File
mod - core/access_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/category_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/custom_field_api.php Diff File
mod - core/file_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/install_helper_functions_api.php Diff File
mod - core/logging_api.php Diff File
mod - core/print_api.php Diff File
mod - core/project_api.php Diff File
mod - core/project_hierarchy_api.php Diff File
mod - core/summary_api.php Diff File
mod - core/tag_api.php Diff File
mod - core/user_api.php Diff File
mod - file_download.php Diff File
mod - lang/strings_english.txt Diff File
mod - manage_config_email_page.php Diff File
mod - proj_doc_delete.php Diff File
mod - proj_doc_edit_page.php Diff File
mod - proj_doc_page.php Diff File
mod - proj_doc_update.php Diff File