Skip to content
Commit 124efe19 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

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

# Conflicts:
#   ontology/saref4auto.ttl
parents 3044d6d8 daa52807
Pipeline #6305 passed with warnings with stages
in 22 seconds
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment