Sebastian Davaris 4061b590cb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/resources/views/admin/menuplans/edit.blade.php skolehjem/resources/views/admin/menuplans/index.blade.php skolehjem/resources/views/admin/menuplans/update.blade.php		2020-06-29 08:32:52 +02:00
..
js	Fixes	2020-06-29 08:13:53 +02:00
lang/en	Initial Commit	2020-06-08 10:04:45 +02:00
sass	Finished calendar.js (for now)	2020-06-26 13:07:57 +02:00
views	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 08:32:52 +02:00