Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev

4 years ago · 56a60e81ba
parent ae6ba1c7d0 abc03534fb
commit 56a60e81ba
2 changed files with 8078 additions and 1 deletions
--- a/composer.lock
+++ b/composer.lock
--- a/config/medialibrary.php
+++ b/config/medialibrary.php
@ -129,7 +129,7 @@ return [
     * The engine that should perform the image conversions.
     * Should be either `gd` or `imagick`.
     */
-    'image_driver' => 'imagick',
+    'image_driver' => env( 'IMAGE_DRIVER','imagick'),

    /*
     * FFMPEG & FFProbe binaries paths, only used if you try to generate video