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

 Conflicts:

	skolehjem/resources/js/navmenu/menu.js

2020-06-23 15:34:12 +02:00

..

admin

Fixed Routes and blades.

2020-06-22 14:53:00 +02:00

app

Added FontAwesome

2020-06-23 15:32:42 +02:00

vendor/font-awesome

Added FontAwesome

2020-06-23 15:32:42 +02:00

webapp

Created Calender

2020-06-23 12:01:27 +02:00