Skip to content
Snippets Groups Projects
Commit d074941d authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'master' into 'fix-4' 

# Conflicts:
#   ontology/saref4wear.ttl
parents a8853d47 08dc305f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 26 deletions
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