Commit 1ab8a403 authored by Romain Bioteau's avatar Romain Bioteau

Merge remote-tracking branch 'origin/master' into release-7.12.0

Conflicts:
	community/bundles/plugins/org.bonitasoft.studio.importer.bos/messages_ja.properties
	community/bundles/plugins/org.bonitasoft.studio.intro/messages_ja.properties
parents af5000d5 3d3d448b
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