Commit 3a354db5 authored by ankraft's avatar ankraft

Merge branch 'WI-0081-Smart_Device_Template_4_0' of git.onem2m.org:MAS/SDT...

Merge branch 'WI-0081-Smart_Device_Template_4_0' of git.onem2m.org:MAS/SDT into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
parents 24da6924 c08d3e84
This diff is collapsed.
Markdown is supported
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