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
..
create.blade.php	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-10-07 15:28:47 +02:00
delete.blade.php	Made it so they can now make there own dynamic guide	2020-08-04 13:21:23 +02:00
edit.blade.php	v1.4.2 - Fixed QL Editor	2020-10-07 11:59:58 +02:00
index.blade.php	v1.4.1 - Small fixes	2020-10-07 08:25:00 +02:00
store.blade.php	Made it so they can now make there own dynamic guide	2020-08-04 13:21:23 +02:00
update.blade.php	Made it so they can now make there own dynamic guide	2020-08-04 13:21:23 +02:00