Anders b4634d4933 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/resources/views/app/layout/base.blade.php		2020-08-05 08:34:23 +02:00
..
js	Fixes	2020-07-28 15:13:33 +02:00
lang/en	Initial Commit	2020-06-08 10:04:45 +02:00
sass	Fixed css	2020-08-03 10:48:17 +02:00
views	Merge remote-tracking branch 'origin/master'	2020-08-05 08:34:23 +02:00