Merge branch 'master' into develop

# Conflicts:
#	config/services.php
This commit is contained in:
Dries Vints 2019-08-14 13:49:52 +02:00
commit c07809e224
No known key found for this signature in database
GPG Key ID: BDD2ED2E8C8025E7
1 changed files with 3 additions and 13 deletions

View File

@ -8,9 +8,9 @@
|--------------------------------------------------------------------------
|
| This file is for storing the credentials for third party services such
| as Stripe, Mailgun, Postmark plus others. This file provides a sane
| default location for this type of information, allowing packages
| to have a conventional place to find your various credentials.
| as Mailgun, Postmark, AWS and more. This file provides a sane start
| location for this type of information, allowing packages to have
| a conventional file to locate the various service credentials.
|
*/
@ -30,14 +30,4 @@
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],
'stripe' => [
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
'webhook' => [
'secret' => env('STRIPE_WEBHOOK_SECRET'),
'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300),
],
],
];