Commit 50797d96 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'issue-18' into 'issue-8' 

# Conflicts:
#   ontology/saref4envi.ttl
parents 0341bf02 b331ca4f

There are no changes