Skip to content
Commit 44ea790a authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

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

# Conflicts:
#   ontology/saref4auto.ttl
parents 0b564ece 21c1e347
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment