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

Merge branch '3.7' into bug-3383

# Conflicts:
#	ChangeLog
parents 3134950d d64a87d9
No related branches found
No related tags found
No related merge requests found
Showing
with 66 additions and 51 deletions
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