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
..
admin	Fixes and todo's	2020-08-05 08:10:38 +02:00
app	Merge remote-tracking branch 'origin/master'	2020-08-05 08:34:23 +02:00
user/layout	Fixes	2020-06-30 10:46:49 +02:00