-
Matija Obreza authored
* tests-to-migrate-to-head: Removed old runners SGSV data import Added SvalbardData entity Multiple "crops" possible Update In_Svalbard status from SGSV data Conflicts: src/main/java/org/genesys2/rest/common/persistence/domain/SvalbardRepository.java src/main/java/org/genesys2/server/service/GenesysService.java src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java src/main/java/org/genesys2/server/service/impl/TaxonomyServiceImpl.java src/main/java/org/genesys2/server/servlet/controller/AdminController.java src/main/webapp/WEB-INF/jsp/admin/index.jsp src/test/java/org/crophub/rest/test/RestTest.java src/test/java/org/genesys2/server/test/RestTest.java src/test/java/org/genesys2/test/RestTest.java
b2e4975f