Merge branch 'develop' into nameEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 Aug 2017 11:45:41 +0000 (13:45 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 Aug 2017 11:45:41 +0000 (13:45 +0200)
commitc3b14b2b863152aa5617f7589d7ef4ef2139928c
tree65c8f54cfcb5b37d5ee58adab903d9b687b03b91
parent8440830883755979f839dcd3c11abd3a96c40341
parent20fa89e35e3a48b063b1ea8cfd4c7e98e77a3f8a
Merge branch 'develop' into nameEditorE4
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java