Skip to content
Snippets Groups Projects
Commit 88c3509d authored by Marcos García de La Fuente's avatar Marcos García de La Fuente
Browse files

Merge remote-tracking branch 'upstream/3.6' into 3.6

Conflicts:
	ChangeLog
parents 71b609fa d40eab24
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.
Finish editing this message first!
Please register or to comment