Project

General

Profile

« Previous | Next » 

Revision 70b69a8c

Added by jenkins over 6 years ago

Merge branch 'hotfix/3.12.4' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java - resolved
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java - UNRESOLVED!!!!!

  • added
  • modified
  • copied
  • renamed
  • deleted