victor 03c1562f5b Merge remote-tracking branch 'origin/master' into master ... # Conflicts: # skolehjem/resources/views/app/news/index.blade.php		2020-11-23 12:28:28 +01:00
..
admin	…
app	Merge remote-tracking branch 'origin/master' into master	2020-11-23 12:28:28 +01:00
errors	…
pdf	…
user/layout	…