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

.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
*~

.DS_Store

catalog-v001.xml

ontology/saref.ttl

+149 −149

File changed.

Preview size limit exceeded, changes collapsed.