Skip to content
Commit c61785fb authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

Merge branch 'develop' into testsuitedata 

# Conflicts:
#	TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot
#	TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot
#	TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot
parents acb092bf db89201e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment