Skip to content
Snippets Groups Projects
Commit 8ac28e39 authored by ankraft's avatar ankraft
Browse files

Merge branch 'WI-0081-Smart_Device_Template_4_0' into RDM-2019-0065-SDT_4_0_-_Documentation_changes

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
parents 7ff61ade 24da6924
No related branches found
No related tags found
No related merge requests found
Showing
with 1266 additions and 744 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment