Revision cb666204 - Merge branch 'develop' into feature/cdm-4.7 Conflicts: cdmlib-model/src/mai... - EDIT - EDIT Project Management

« Previous | Next »

Revision cb666204

Added by Andreas Müller almost 7 years ago

ID cb666204f7919149d959396a4a7619df826ab3ab
Parent 8a657847, 334b7b2b
Child e6d7b501

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java

Changes

added
modified
copied
renamed
deleted