Merge branch 'develop' into bulkEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 13 Sep 2017 07:34:48 +0000 (09:34 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 13 Sep 2017 07:34:48 +0000 (09:34 +0200)
commit369e69a0adf5940b0aa949f1fc353b9e3239623a
tree3a47631dac4df18c2dd729f17d795969597e8b61
parent5cfc8708441a139bd767ab38a4cb2e21062c0391
parent93c8d15259c1743c9e829aa26e38b767efced326
Merge branch 'develop' into bulkEditorE4

# Conflicts:
# eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisapplicationContainerE4.java
# eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisapplicationContainerE4.java
eu.etaxonomy.taxeditor.store/fragment.e4xmi
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java