Commit 77423bb7 authored 5 years ago by Tor-Einar Skog

Merge branch 'develop' into 'Observation'

# 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

parents 4afacefd a032cf5f

Hide whitespace changes

Inline Side-by-side

Showing with 1053 additions and 10 deletions

Please register or to comment