Commit e8e663fd authored by Pony's avatar Pony

Merge branch 'master' of https://git.list.lu/nui/TULIP-Scenario.git

Conflicts:
	Scenarios/scenarios/simplesentences/Simplesentences.xml
parents 5d1269c7 7027a363
Markdown is supported
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