Skip to content
Commit 855ad63b authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'master' into 'issue-28' 

# Conflicts:
#   ontology/saref4wear.ttl
parents bf027f1c 39f7334c
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