Merge pull request Intervention#313 from kitakira/fix-params-mergeCon…

…figFrom

Fix params mergeConfigFrom

Laravel 5 compatibility

Merge branch 'katzefudder-master'

fixed bug images losing colorspace when using resizeCanvas

bugfix

addition to previous commit

added content-length http header field to response method

Merge branch 'master' of github.com:Intervention/image

Merge pull request Intervention#234 from olivervogel/master

psr-4

added possibility to reset multiple times to a backup