Anders e0bbcf8fd0 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/public/css/admin.css # skolehjem/public/css/webapp.css # skolehjem/public/css/webappdark.css # skolehjem/resources/views/app/news/index.blade.php		2020-11-26 10:21:16 +01:00
..
index.blade.php	Merge remote-tracking branch 'origin/master'	2020-11-26 10:21:16 +01:00