Merge branch 'master' into develop

2016-05-30 12:03:49 +01:00
parent f95f384ba3 b4024058bb
commit b6bd185048
3 changed files with 6 additions and 1 deletions
--- a/config/services.php
+++ b/config/services.php
@@ -19,6 +19,10 @@ return [
        'secret' => env('MAILGUN_SECRET'),
    ],

+    'mandrill' => [
+        'secret' => env('MANDRILL_SECRET'),
+    ],
+
    'ses' => [
        'key' => env('SES_KEY'),
        'secret' => env('SES_SECRET'),