Commit 9344e7e0 authored by Romain Bioteau's avatar Romain Bioteau
Browse files

Merge remote-tracking branch 'origin/7.1.x' into 7.2.x

Conflicts:
	translations/fr/org.bonitasoft.studio.designer.nl_fr/messages_fr.properties
parents afef1b3e 42fa1887
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