Skip to content
Snippets Groups Projects
Select Git revision
  • develop default protected
  • dockersetup
  • feature/time-series
  • feature/vipsutv-1047-timeseries
  • renovate/selenium-4.x
  • renovate/org.apache.commons-commons-csv-1.x
  • renovate/org.postgresql-postgresql-42.x
  • renovate/org.hibernate-hibernate-core-6.x
  • renovate/org.hibernate.orm-hibernate-spatial-6.x
  • feature/upgrade-openlayers
  • renovate/org.apache.poi-poi-ooxml-5.x
  • renovate/org.apache.poi-poi-5.x
  • renovate/org.flywaydb-flyway-core-11.x
  • renovate/org.flywaydb-flyway-database-postgresql-11.x
  • renovate/no.nibio.vips-vipscommon-3.x
  • renovate-updates
  • wildfly-34
  • feature/vipsutv-737-map-module
  • feature/vipsutv-710-download-excel
  • Phytophthoraregistrering-VIPSUTV-735
  • Tag-Phenology-V3
21 results
Blame Permalink
  • Tor-Einar Skog's avatar
    77423bb7
    Merge branch 'develop' into 'Observation' · 77423bb7
    Tor-Einar Skog authored 
    # Conflicts:
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
    77423bb7
    History
    Merge branch 'develop' into 'Observation'
    Tor-Einar Skog authored 
    # Conflicts:
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
#   src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties