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

Merge branch '3.3' into bug-817 

Conflicts:
	ChangeLog
parents b3a03595 7e48e341
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