Commit 4fc0217a authored by Guy Thouret's avatar Guy Thouret
Browse files

Merge branch 'master' into chore/665-refactor-object-use 

# Conflicts:
#	Core/Media/Imagick/Resize.php
parents 6052b851 af77626a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment