Skip to content
Snippets Groups Projects
Commit 2c493a4f authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	ChangeLog
parents 7d72b6c3 71ee974d
No related branches found
No related tags found
No related merge requests found
Showing with 212 additions and 47 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment