Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 2 Nov 2015 11:50:52 +0000 (12:50 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 2 Nov 2015 13:11:21 +0000 (14:11 +0100)
commitb99ebb39bf728e9c6803fc8844d194dc5a677af8
treebdbf9681b293bd60b84e9fd301643e0ea7684f6d
parent4b61c2b2d5f13e3015fab17406dc1ada40c7f5b8
parentd85f4cfb62f40a8a60d1ca7c149dcbbf21e03dbd
Merge branch 'develop' into unify_derivative_views

Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java