Revision 4610de84
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
