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

Merge remote-tracking branch... 

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

# Conflicts:
#	doc/tests/test_ContextInformation_Consumption.py
#	resources/AssertionUtils.resource
parents 534f055e 9fd9d65a
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