Project

General

Profile

« Previous | Next » 

Revision 80b84cd4

ID80b84cd441ef1e791e95f5bb0067fea440dfef0d
Parent ae2b6d7b, aff7bab0
Child 7a572190

Added by Patrick Plitzner almost 2 years ago

Merge branch 'develop' into detailsViewCache

Conflicts:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)