Merge "Merge branch '1.3-rel' (5fdb8a1)"
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Mon, 27 Nov 2017 21:33:39 +0000 (21:33 +0000)
committerNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Mon, 27 Nov 2017 21:33:39 +0000 (21:33 +0000)
1  2 
resource/csdk/security/src/credresource.c
resource/csdk/security/tool/json2cbor.c