Merge branch 'develop' into wset
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Dec 2017 07:36:09 +0000 (08:36 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Dec 2017 07:36:09 +0000 (08:36 +0100)
commit6bc9c25fb9a97774982438025f9481f03b1e0e79
tree9a1f4a076ef36c625feacb99fa51b33fe0a64a9b
parentfa33762ce21fee998a2dd5537869ecd10a3f8f1f
parenteeba609a5bc21aeefd1358ad7904001c1475b117
Merge branch 'develop' into wset
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java