victor 2681472772 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master ... Conflicts: skolehjem/database/migrations/2020_08_06_092000_create_news_table.php skolehjem/resources/views/admin/news/create.blade.php skolehjem/resources/views/admin/news/edit.blade.php		2020-10-07 15:28:47 +02:00
..
dk	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-10-07 15:28:47 +02:00
en	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-10-07 15:28:47 +02:00