Commit a16d1a85 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #11975 from owncloud/Combustible-combustible_dev

Check imagecreate*() return before using and use logger in \OC_Image
parents e9029f94 b2175f0e
This diff is collapsed.
Markdown is supported
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