BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57b3dae c0222c3)
Merge branch 'hotfix/3.12.4' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 15 Feb 2016 09:10:24 +0000 (10:10 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 15 Feb 2016 09:10:24 +0000 (10:10 +0100)
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


Trivial merge