Merge branch 'develop' into 5.7.0

# Conflicts:
#	composer.json
#	composer.lock
This commit is contained in:
James Cole
2022-03-19 07:58:06 +01:00
147 changed files with 858 additions and 669 deletions

View File

@@ -101,7 +101,7 @@ return [
'webhooks' => false,
'handle_debts' => true,
],
'version' => '5.6.15',
'version' => '5.6.16',
'api_version' => '1.5.5',
'db_version' => 18,

View File

@@ -36,7 +36,7 @@ return [
|
*/
'guard' => ['web'],
'guard' => [env('AUTHENTICATION_GUARD', 'web')],
/*
|--------------------------------------------------------------------------