Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json
This commit is contained in:
Peter Papp
2021-04-06 10:02:20 +02:00
10 changed files with 234 additions and 46 deletions
+2 -2
View File
@@ -26,8 +26,8 @@ class AuthServiceProvider extends ServiceProvider
{
$this->registerPolicies();
// Define admin settings gate
Gate::define('admin-settings', function ($user) {
// Define admin maintenance gate
Gate::define('maintenance', function ($user) {
return $user->role === 'admin';
});
}