MantisBT: master f9d98822

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-12-01 07:23 master 0c990fea
Changeset

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

Conflicts:
lang/strings_dutch.txt
mod - core/custom_field_api.php Diff File
mod - lang/strings_dutch.txt Diff File
mod - lang/strings_german.txt Diff File
mod - lang/strings_japanese.txt Diff File
mod - lang/strings_lithuanian.txt Diff File
mod - lang/strings_norwegian_bokmal.txt Diff File
mod - lang/strings_spanish.txt Diff File
mod - lang/strings_vietnamese.txt Diff File
mod - plugins/MantisGraph/lang/strings_norwegian_bokmal.txt Diff File
mod - plugins/MantisGraph/lang/strings_qqq.txt Diff File
mod - plugins/MantisGraph/lang/strings_spanish.txt Diff File
mod - plugins/XmlImportExport/lang/strings_spanish.txt Diff File