Merge branch 'dev' into oauth-integration
# Conflicts: # winery/harvest-management/src/main/java/org/delta/winery/harvestwine/controllers/HarvestController.java # winery/harvest-management/src/main/java/org/delta/winery/harvestwine/facade/HarvestFacade.java # winery/harvest-management/src/main/java/org/delta/winery/harvestwine/service/HarvestManagementService.java # winery/harvest-management/src/main/java/org/delta/winery/harvestwine/service/HarvestManagementServiceImpl.java
Please register or sign in to comment