seba4928 b55fd18c71 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ...

 Conflicts:

	skolehjem/resources/views/app/root/index.blade.php

2020-06-25 14:56:45 +02:00

..

bookings

Working on calendar.js

2020-06-25 08:28:36 +02:00

contact

Fixes

2020-06-25 14:52:04 +02:00

layout

Moved files

2020-06-24 09:25:59 +02:00

menuplans

Moved files

2020-06-24 09:25:59 +02:00

root

Fixes

2020-06-25 14:52:04 +02:00

users

Edited frontpage

2020-06-25 14:23:52 +02:00

vagttelefons

Added text in external-links. Added admin->menuplans->index Added foreach in admin->washing-machines->index, fixed title in app->vagttelefons->index

2020-06-25 09:04:23 +02:00