Skip to content
Commit 34260ab7 authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'master' into 'develop' 

# Conflicts:
#   ontology/saref4wear.ttl
parents 41770cb8 824bfe8a
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