Merge branch 'develop' into nameEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 29 Aug 2017 12:33:06 +0000 (14:33 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 29 Aug 2017 12:33:06 +0000 (14:33 +0200)
commit9f0858e0e378ea62fd1ebd511f67eb6f159c4d47
treef03ff3b4f5dffad273613ae25f355be6ba29737e
parentb02af7f62649fd5e3a37483b1729aa1a631a3452
parent7a023b3efa929d31b7ec3151e588f914ece1c742
Merge branch 'develop' into nameEditorE4

# Conflicts:
# eu.etaxonomy.taxeditor.editor/fragment.e4xmi
eu.etaxonomy.taxeditor.editor/fragment.e4xmi
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java