MantisBT: master 1da646f6

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2016-01-31 18:01 master cf38086f
Changeset

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

Conflicts:

manage_user_create_page.php

manage_user_edit_page.php
mod - admin/schema.php Diff File
mod - admin/upgrade_unattended.php Diff File
mod - core/error_api.php Diff File
mod - core/events_inc.php Diff File
mod - core/logging_api.php Diff File
mod - core/user_api.php Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Manage.xml Diff File
mod - lang/strings_amharic.txt Diff File
mod - lang/strings_asturian.txt Diff File
mod - lang/strings_basque.txt Diff File
mod - lang/strings_belarusian_tarask.txt Diff File
mod - lang/strings_breton.txt Diff File
mod - lang/strings_bulgarian.txt Diff File
mod - lang/strings_catalan.txt Diff File
mod - lang/strings_chinese_simplified.txt Diff File
mod - lang/strings_chinese_traditional.txt Diff File
mod - lang/strings_dutch.txt Diff File
mod - lang/strings_estonian.txt Diff File
mod - lang/strings_galician.txt Diff File
mod - lang/strings_german.txt Diff File
mod - lang/strings_hebrew.txt Diff File
mod - lang/strings_interlingua.txt Diff File
mod - lang/strings_italian.txt Diff File
mod - lang/strings_japanese.txt Diff File
mod - lang/strings_korean.txt Diff File
mod - lang/strings_lithuanian.txt Diff File
mod - lang/strings_norwegian_bokmal.txt Diff File
mod - lang/strings_polish.txt Diff File
mod - lang/strings_portuguese_brazil.txt Diff File
mod - lang/strings_ripoarisch.txt Diff File
mod - lang/strings_serbian.txt Diff File
mod - lang/strings_serbian_latin.txt Diff File
mod - lang/strings_spanish.txt Diff File
mod - lang/strings_swedish.txt Diff File
mod - lang/strings_swissgerman.txt Diff File
mod - lang/strings_tagalog.txt Diff File
mod - lang/strings_ukrainian.txt Diff File
mod - login_page.php Diff File
mod - manage_user_create_page.php Diff File
mod - manage_user_edit_page.php Diff File
mod - manage_user_update.php Diff File
mod - plugins/MantisGraph/lang/strings_korean.txt Diff File
mod - plugins/XmlImportExport/lang/strings_korean.txt Diff File