Merge branch 'develop' into featureTreeEditor
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Jun 2017 10:10:07 +0000 (12:10 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Jun 2017 10:10:07 +0000 (12:10 +0200)
commit10cc56c0d0f9982021ee4eb2d857d74a9983e6cc
tree959f08ebcff4a978a425070a767a2529a0d002dd
parent8685103907c29ae2d34dc36476214d7ca858ba14
parent47aa3510fb215952552acd44d69dab100fa938a4
Merge branch 'develop' into featureTreeEditor

# Conflicts:
# eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java