MantisBT: master ee8277bb

Diff Back to Repository
Author Committer Branch Timestamp Parent
vboctor vboctor master 2016-11-23 23:10 master 5e660ff1
Changeset

Merge remote-tracking branch 'origin/master-1.3.x'

Conflicts:

account_prefs_inc.php

bugnote_add.php

core/html_api.php
mod - account_prefs_inc.php Diff File
mod - account_prefs_update.php Diff File
mod - account_update.php Diff File
mod - bug_change_status_page.php Diff File
mod - bug_report_page.php Diff File
mod - bugnote_add.php Diff File
mod - config_defaults_inc.php Diff File
mod - core/access_api.php Diff File
mod - core/bugnote_api.php Diff File
mod - core/columns_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/email_api.php Diff File
mod - core/file_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/history_api.php Diff File
mod - core/layout_api.php Diff File
mod - core/mention_api.php Diff File
mod - core/summary_api.php Diff File
mod - core/tag_api.php Diff File
mod - docbook/Admin_Guide/en-US/config/email.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Bug.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Filter.xml Diff File
mod - lang/strings_afrikaans.txt Diff File
mod - lang/strings_amharic.txt Diff File
mod - lang/strings_arabic.txt Diff File
mod - lang/strings_arabicegyptianspoken.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_czech.txt Diff File
mod - lang/strings_danish.txt Diff File
mod - lang/strings_dutch.txt Diff File
mod - lang/strings_english.txt Diff File
mod - lang/strings_estonian.txt Diff File
mod - lang/strings_finnish.txt Diff File
mod - lang/strings_french.txt Diff File
mod - lang/strings_galician.txt Diff File
mod - lang/strings_german.txt Diff File
mod - lang/strings_greek.txt Diff File
mod - lang/strings_hebrew.txt Diff File
mod - lang/strings_hungarian.txt Diff File
mod - lang/strings_icelandic.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_latvian.txt Diff File
mod - lang/strings_lithuanian.txt Diff File
mod - lang/strings_macedonian.txt Diff File
mod - lang/strings_norwegian_bokmal.txt Diff File
mod - lang/strings_occitan.txt Diff File
mod - lang/strings_polish.txt Diff File
mod - lang/strings_portuguese_brazil.txt Diff File
mod - lang/strings_portuguese_standard.txt Diff File
mod - lang/strings_ripoarisch.txt Diff File
mod - lang/strings_romanian.txt Diff File
mod - lang/strings_russian.txt Diff File
mod - lang/strings_serbian.txt Diff File
mod - lang/strings_serbian_latin.txt Diff File
mod - lang/strings_slovak.txt Diff File
mod - lang/strings_slovene.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_turkish.txt Diff File
mod - lang/strings_ukrainian.txt Diff File
mod - lang/strings_urdu.txt Diff File
mod - lang/strings_vietnamese.txt Diff File
mod - plugins/MantisGraph/lang/strings_italian.txt Diff File
mod - plugins/MantisGraph/lang/strings_korean.txt Diff File
mod - plugins/MantisGraph/lang/strings_occitan.txt Diff File
mod - plugins/MantisGraph/lang/strings_russian.txt Diff File
mod - plugins/MantisGraph/lang/strings_spanish.txt Diff File
mod - plugins/MantisGraph/lang/strings_swedish.txt Diff File
mod - plugins/MantisGraph/lang/strings_ukrainian.txt Diff File
mod - plugins/XmlImportExport/lang/strings_spanish.txt Diff File