Merge branch 'release/5.4.0'

author jenkins <jenkins-int@bgbm.org>

Thu, 25 Oct 2018 12:46:55 +0000 (14:46 +0200)

committer jenkins <jenkins-int@bgbm.org>

Thu, 25 Oct 2018 12:46:55 +0000 (14:46 +0200)
author jenkins <jenkins-int@bgbm.org>
Thu, 25 Oct 2018 12:46:55 +0000 (14:46 +0200)
committer jenkins <jenkins-int@bgbm.org>
Thu, 25 Oct 2018 12:46:55 +0000 (14:46 +0200)
diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
Simple merge
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
Simple merge
author	jenkins <jenkins-int@bgbm.org>
	Thu, 25 Oct 2018 12:46:55 +0000 (14:46 +0200)
committer	jenkins <jenkins-int@bgbm.org>
	Thu, 25 Oct 2018 12:46:55 +0000 (14:46 +0200)
		1	2
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java	patch \|	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java	patch \|	diff1 \|	diff2 \|	blob \| history