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

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

Conflicts:
	ChangeLog
parents 3aee8fa9 38ba6ac7
No related branches found
No related tags found
No related merge requests found
Showing
with 240 additions and 12 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment