Skip to content
Commit 4ab96468 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'master' into 'issue-32' 

# Conflicts:
#   ontology/saref.ttl
parents b1a473e4 61342e4d
Expand all 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