Vedde 578dd8d522 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/MenuPlanController.php # skolehjem/resources/views/admin/external-links/index.blade.php		2020-06-26 13:56:47 +02:00
..
admin	Merge remote-tracking branch 'origin/master'	2020-06-26 13:56:47 +02:00
app	Fixed Routes in base.blade.php	2020-06-26 13:14:02 +02:00
user	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-16 08:13:36 +02:00
welcome.blade.php	Initial Commit	2020-06-08 10:04:45 +02:00