MantisBT: master 969aab52

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2015-11-23 18:34 master 6d98097f
Changeset

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

Conflicts:

adm_config_report.php

billing_inc.php

bug_file_upload_inc.php

bug_monitor_list_view_inc.php

bug_report_page.php

bug_sponsorship_list_view_inc.php

bugnote_add_inc.php

bugnote_stats_inc.php

bugnote_view_inc.php

core/collapse_api.php

core/filter_api.php

core/html_api.php

core/obsolete.php

core/relationship_api.php

css/default.css

css/status_config.php

history_inc.php

javascript/common.js

manage_custom_field_edit_page.php

plugins/MantisGraph/MantisGraph.php
mod - admin/index.php Diff File
mod - api/soap/mc_filter_api.php Diff File
mod - api/soap/mc_issue_api.php Diff File
mod - api/soap/mc_project_api.php Diff File
mod - bug_sponsorship_list_view_inc.php Diff File
mod - bug_update_page.php Diff File
mod - config_defaults_inc.php Diff File
mod - core/collapse_api.php Diff File
mod - core/email_api.php Diff File
mod - core/event_api.php Diff File
mod - core/file_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/html_api.php Diff File
mod - core/obsolete.php Diff File
mod - core/plugin_api.php Diff File
mod - core/print_api.php Diff File
mod - core/string_api.php Diff File
mod - core/user_api.php Diff File
mod - css/status_config.php Diff File
mod - docbook/Admin_Guide/en-US/About.xml Diff File
mod - docbook/Admin_Guide/en-US/config/signup.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Account.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Manage.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Output.xml Diff File
mod - lang/strings_dutch.txt Diff File
mod - lang/strings_english.txt Diff File
mod - lang/strings_italian.txt Diff File
mod - lang/strings_ripoarisch.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_asturian.txt Diff File
mod - plugins/MantisGraph/MantisGraph.php Diff File
add - plugins/MantisGraph/lang/strings_asturian.txt Diff File
add - plugins/XmlImportExport/lang/strings_asturian.txt Diff File
mod - plugins/XmlImportExport/lang/strings_italian.txt Diff File