Merge branch 'develop' into 5.8-dev

# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
This commit is contained in:
James Cole
2022-09-07 18:35:01 +02:00
49 changed files with 1133 additions and 1207 deletions

View File

@@ -64,7 +64,6 @@ class AuthServiceProvider extends ServiceProvider
);
$this->registerPolicies();
Passport::routes();
Passport::tokensExpireIn(now()->addDays(14));
}
}