Anders b4634d4933 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/resources/views/app/layout/base.blade.php		2020-08-05 08:34:23 +02:00
..
base.blade.php	Merge remote-tracking branch 'origin/master'	2020-08-05 08:34:23 +02:00