Project

General

Profile

« Previous | Next » 

Revision 62ad4734

ID62ad47345c8e866db9bd46fce7f51e6bb6a96e93
Parent 57b3dae2, c0222c32
Child ac5020e6

Added by jenkins over 4 years ago

Merge branch 'hotfix/3.12.4' into develop

Conflicts:
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.xml

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)