MantisBT: master ae3f255f

Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2015-04-08 18:37 master 6a32ba7f
Changeset

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

Conflicts:
bug_reminder_page.php
css/default.css
lost_pwd_page.php
manage_proj_create_page.php
signup_page.php

mod - api/soap/mantisconnect.php Diff File
mod - bug_reminder_page.php Diff File
mod - config_defaults_inc.php Diff File
mod - core.php Diff File
mod - core/constant_inc.php Diff File
mod - core/email_api.php Diff File
mod - core/helper_api.php Diff File
mod - core/html_api.php Diff File
mod - core/logging_api.php Diff File
mod - core/print_api.php Diff File
mod - css/login.css Diff File
mod - docbook/Admin_Guide/en-US/Installation.xml Diff File
mod - docbook/Admin_Guide/en-US/Revision_History.xml Diff File
mod - docbook/Admin_Guide/en-US/config/defaults.xml Diff File
mod - docbook/Admin_Guide/en-US/config/misc.xml Diff File
mod - docbook/Admin_Guide/en-US/config/security.xml Diff File
mod - docbook/Admin_Guide/en-US/config/webserver.xml Diff File
mod - lang/strings_english.txt Diff File
mod - lost_pwd_page.php Diff File
mod - manage_proj_create_page.php Diff File
mod - signup_page.php Diff File