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

Merge remote-tracking branch 'origin/feature/add-entity-type-selection-tests' into parsespec 

# Conflicts:
#	TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot
parents 4fc421a5 e4ba64b9
Hide whitespace changes
Inline Side-by-side
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