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
..
admin	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-10-07 15:28:47 +02:00
app	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-10-07 15:28:47 +02:00
errors	v0.10.17a - Various fixes	2020-08-31 11:56:05 +02:00
pdf	v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs	2020-08-20 14:59:22 +02:00
user/layout	Update base.blade.php	2020-08-21 13:41:06 +02:00