Merge branch 'develop' into 5.8-dev

# Conflicts:
#	frontend/package.json
#	frontend/yarn.lock

config/firefly.php

@@ -103,7 +103,7 @@ return [
         'webhooks'     => false,
         'handle_debts' => true,
     ],
-    'version'                      => '5.7.5',
+    'version'                      => '5.7.9',
     'api_version'                  => '1.5.6',
     'db_version'                   => 18,
 
@@ -285,6 +285,12 @@ return [
         'application/vnd.oasis.opendocument.formula',
         'application/vnd.oasis.opendocument.database',
         'application/vnd.oasis.opendocument.image',
+
+        /* EML */
+        'message/rfc822',
+
+        /* JSON */
+        'application/json',
     ],
     'accountRoles'                 => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset', 'cashWalletAsset'],
     'valid_liabilities'            => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE],

config/mail.php

@@ -44,6 +44,7 @@ return [
             'username'   => env('MAIL_USERNAME'),
             'password'   => env('MAIL_PASSWORD'),
             'timeout'    => null,
+            'verify_peer' => null !== env('MAIL_ENCRYPTION')
         ],
 
         'ses' => [