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
..
admin	v0.10.17 - Added permission check (create/edit/delete) on all admin sites	2020-08-31 10:57:26 +02:00
app	Merge remote-tracking branch 'origin/master'	2020-08-31 14:35:03 +02:00
errors	v0.10.17a - Various fixes	2020-08-31 11:56:05 +02:00
pdf	v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs	2020-08-20 14:59:22 +02:00
user/layout	Update base.blade.php	2020-08-21 13:41:06 +02:00