MantisBT: master 6d914681

Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2015-12-08 00:44:47 master f4c08e7e
Changeset

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

Conflicts:

core/html_api.php

css/default.css

library/README.libs

library/securimage

manage_config_workflow_page.php

mod - .travis.yml Diff File
mod - account_page.php Diff File
mod - admin/schema.php Diff File
mod - api/soap/mc_api.php Diff File
add - api_token_create.php Diff File
add - api_token_revoke.php Diff File
add - api_tokens_page.php Diff File
mod - bug_update.php Diff File
add - core/api_token_api.php Diff File
mod - core/authentication_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/database_api.php Diff File
mod - core/email_api.php Diff File
mod - core/history_api.php Diff File
mod - core/html_api.php Diff File
mod - core/install_helper_functions_api.php Diff File
mod - doc/CREDITS Diff File
mod - docbook/Admin_Guide/en-US/Page_Descriptions.xml Diff File
mod - lang/strings_english.txt Diff File
rm - library/README.libs Diff File
add - library/README.md Diff File
mod - manage_config_email_page.php Diff File
mod - manage_config_email_set.php Diff File
mod - manage_config_workflow_page.php Diff File
mod - manage_config_workflow_set.php Diff File
mod - readme.md Diff File