Skip to content
Commit 235638e5 authored by Christopher Schäpers's avatar Christopher Schäpers
Browse files

Merge branch 'master' into fix_4258 

Conflicts:
	lib/image.php
parents 0869f9b6 92e90c8e
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