Anders dfd8420270 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/MenuPlan.php		2020-06-30 12:40:02 +02:00
..
admin	Merge remote-tracking branch 'origin/master'	2020-06-30 12:40:02 +02:00
app	Merge remote-tracking branch 'origin/master'	2020-06-30 12:40:02 +02:00
user/layout	Fixes	2020-06-30 10:46:49 +02:00