Project

General

Profile

« Previous | Next » 

Revision 4610de84

ID4610de8498280b6761b357be1185a7c343f42d69
Parent 52a59b6e, 5f470a91
Child 8c3fb210

Added by Andreas Kohlbecker about 2 years ago

Merge branch 'phycobank' into develop

Conflicts:
src/main/java/eu/etaxonomy/cdm/mock/Registration.java
src/main/java/eu/etaxonomy/cdm/mock/RegistrationService.java
src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTO.java
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationWorkingSet.java
src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/TypeDesignationConverter.java
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/settings/SettingsPresenter.java
src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationDTO.java
src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)