Skip to content
Commit 483a3119 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branches 'issue-18' and 'issue-18' of... 

Merge branches 'issue-18' and 'issue-18' of https://forge.etsi.org/gitlab/SAREF/saref-core into issue-18

# Conflicts:
#	ontology/saref.ttl
parents 598043ba ceb2cebf
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