Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/app/Http/Controllers/ContactController.php		2020-06-29 14:48:53 +02:00
..
js	Fixes	2020-06-29 09:26:07 +02:00
lang/en	Initial Commit	2020-06-08 10:04:45 +02:00
sass	Fixes	2020-06-29 14:11:15 +02:00
views	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 14:48:53 +02:00