]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #11975 from owncloud/Combustible-combustible_dev
authorMorris Jobke <hey@morrisjobke.de>
Tue, 2 Dec 2014 15:18:00 +0000 (16:18 +0100)
committerMorris Jobke <hey@morrisjobke.de>
Tue, 2 Dec 2014 15:18:00 +0000 (16:18 +0100)
Check imagecreate*() return before using and use logger in \OC_Image


Trivial merge