Merge branch 'develop' into featureTreeEditor
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 19 Jun 2017 09:05:35 +0000 (11:05 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 19 Jun 2017 09:05:35 +0000 (11:05 +0200)
commita7343965fadd0aab25fe472b5cb839a91878bae1
tree50208be25ebd271086c184c88d2df3fd7cc87234
parent34abc4b5b53f892a652b48e3682f08018cd0bc84
parent34fd7a1c2322da2e85d7533af064bd9ca0caca11
Merge branch 'develop' into featureTreeEditor

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