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

Merge branch '3.6' into bug-1649 

Conflicts:
	ChangeLog
parents 3212fd2b c4a6377a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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