Revision 4b6abd7e - Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop... - EDIT - EDIT Project Management

« Previous | Next »

Revision 4b6abd7e

Added by Andreas Müller over 7 years ago

ID 4b6abd7e88d34f6363270c92cdecab8ade8a4d62
Parent 6de6d849, 645658b9
Child 4bcc0c85

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

Changes

added
modified
copied
renamed
deleted