Anders 9b26e5f1af Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/RootController.php # skolehjem/resources/views/app/news/index.blade.php		2020-08-31 14:35:03 +02:00
..
index.blade.php	Merge remote-tracking branch 'origin/master'	2020-08-31 14:35:03 +02:00