Revision b99ebb39 - Merge branch 'develop' into unify_derivative_views Conflicts: eu.etaxonomy.... - EDIT - EDIT Project Management

« Previous | Next »

Revision b99ebb39

Added by Patrick Plitzner over 8 years ago

ID b99ebb39bf728e9c6803fc8844d194dc5a677af8
Parent 4b61c2b2, d85f4cfb
Child af0c6587

Merge branch 'develop' into unify_derivative_views

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

Changes

added
modified
copied
renamed
deleted