• Matija Obreza's avatar
    Merge branch 'forages' into staging · aa5e4dfb
    Matija Obreza authored
    * forages:
      Reassign accession#crop based on #cropName
    
    # Conflicts:
    #	src/main/java/org/genesys2/server/persistence/domain/AccessionRepository.java
    #	src/main/java/org/genesys2/server/service/GenesysService.java
    #	src/main/java/org/genesys2/server/service/impl/CropServiceImpl.java
    #	src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
    #	src/main/webapp/WEB-INF/jsp/crop/index.jsp
    aa5e4dfb
pom.xml 22.8 KB