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

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

Conflicts:
	.travis.yml
parents 36e6f9a9 869bde5f
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment