Merge branch 'develop' into wset
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 18 Dec 2017 08:57:22 +0000 (09:57 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 18 Dec 2017 08:57:22 +0000 (09:57 +0100)
commit40426234c3acfdec41e4fce665f3a4c90ca123c2
treeb669253fcc2419af25c062439f9e2fd721706842
parent1016796d42f019bdfefbafbf15402ba947c5a4f4
parent28c6d8ea6fd91b79c496fd42938eac227c5b1a9e
Merge branch 'develop' into wset

# Conflicts:
# eu.etaxonomy.taxeditor.editor/fragment.e4xmi
eu.etaxonomy.taxeditor.editor/fragment.e4xmi
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java