Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts: skolehjem/database/seeds/RoleSeeder.php
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App;
|
||||
use App\ExternalLink;
|
||||
use App\MenuPlan;
|
||||
use App\News;
|
||||
use App\User;
|
||||
|
||||
Reference in New Issue
Block a user