Anders e0b998dec0 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/UserEventController.php		2020-08-07 10:52:25 +02:00
..
js	Fixes	2020-07-28 15:13:33 +02:00
lang	v0.5.9 - Fixed en/dk messages + added backend en/dk messages	2020-08-07 10:51:10 +02:00
sass	Fixed css	2020-08-05 08:45:29 +02:00
views	Merge remote-tracking branch 'origin/master'	2020-08-07 10:52:25 +02:00