Anders 9b26e5f1af Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/RootController.php # skolehjem/resources/views/app/news/index.blade.php		2020-08-31 14:35:03 +02:00
..
js	v0.10.16 - Various fixes	2020-08-31 09:36:10 +02:00
lang	v0.10.15p - Fixed 'msg.telefontid'	2020-08-28 12:54:39 +02:00
sass	v0.10.17a - Various fixes	2020-08-31 11:56:05 +02:00
views	Merge remote-tracking branch 'origin/master'	2020-08-31 14:35:03 +02:00