Anders e0b998dec0 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/UserEventController.php		2020-08-07 10:52:25 +02:00
..
Controllers	Merge remote-tracking branch 'origin/master'	2020-08-07 10:52:25 +02:00
Middleware	v0.5.7b - Added middelware	2020-08-07 08:52:01 +02:00
Kernel.php	v0.5.7 - Made multi language option	2020-08-06 15:31:38 +02:00