Skip to content
Commit 20bcfcad authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'develop-v2.1.1' into 'issue-26' 

# Conflicts:
#   ontology/saref4auto.ttl
parents 3359c3de f7a6c9d2