Skip to content
Commit 99fb619d authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'issue-27' into 'issue-29' 

# Conflicts:
#   ontology/saref4auto.ttl
parents 3862f5a6 124efe19