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
..
create.blade.php	Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations	2020-06-26 12:20:20 +02:00
delete.blade.php	Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations	2020-06-26 12:20:20 +02:00
edit.blade.php	Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations	2020-06-26 12:20:20 +02:00
index.blade.php	Fixes	2020-06-29 08:13:53 +02:00
show.blade.php	Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations	2020-06-26 12:20:20 +02:00
store.blade.php	Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations	2020-06-26 12:20:20 +02:00
update.blade.php	Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations	2020-06-26 12:20:20 +02:00