Merge branch 'develop' into featureTreeEditor
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 28 Jun 2017 10:12:56 +0000 (12:12 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 28 Jun 2017 10:12:56 +0000 (12:12 +0200)
commita1dfc0b86e6917750d953a6171dd91697f66d1c1
treee2776f133e84ad55fa2e6ac0bbad4ca53b10f65f
parent9d4c156874ee4494c2908433caaf05630cd4b454
parent12257a98270d8b7aa7582616e89cb0f8dda73d9e
Merge branch 'develop' into featureTreeEditor
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java