Anders 8987db9d31 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	skolehjem/resources/views/admin/washing-reservations/index.blade.php

2020-06-29 08:19:55 +02:00

..

events

Removed ID From all admin sites.

2020-06-26 12:17:46 +02:00

external-links

Merge remote-tracking branch 'origin/master'

2020-06-26 13:56:47 +02:00

layout

Fixes

2020-06-29 08:13:53 +02:00

menuplans

Fix route link til edit på menuplan

2020-06-29 08:02:42 +02:00

root

Removed:

2020-06-25 13:28:51 +02:00

users

Removed ID From all admin sites.

2020-06-26 12:17:46 +02:00

washing-machines

Removed ID From all admin sites.

2020-06-26 12:17:46 +02:00

washing-reservations

Merge remote-tracking branch 'origin/master'

2020-06-29 08:19:55 +02:00

index.blade.php

Added admin sites

2020-06-15 08:56:21 +02:00