Vedde 578dd8d522 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/MenuPlanController.php # skolehjem/resources/views/admin/external-links/index.blade.php		2020-06-26 13:56:47 +02:00
..
js	Finished calendar.js (for now)	2020-06-26 13:07:57 +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 remote-tracking branch 'origin/master'	2020-06-26 13:56:47 +02:00