• Matija Obreza's avatar
    Merge branch 'forages' into staging · 2f35199d
    Matija Obreza authored
    # Conflicts:
    #	src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java
    #	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/GenesysServiceImpl.java
    #	src/main/webapp/WEB-INF/jsp/accession/details.jsp
    #	src/main/webapp/WEB-INF/jsp/crop/index.jsp
    2f35199d
pom.xml 22.9 KB