frederikpyt 1863d953f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/resources/views/admin/menuplans/create.blade.php		2020-06-29 10:52:18 +02:00
..
contacts	Contact frontend	2020-06-29 10:40:34 +02:00
events	Removed ID From all admin sites.	2020-06-26 12:17:46 +02:00
external-links	updated Externallink. Should be able to do crud	2020-06-29 09:19:43 +02:00
layout	Contact frontend	2020-06-29 10:40:34 +02:00
menuplans	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 10:52:18 +02:00
root	Removed:	2020-06-25 13:28:51 +02:00
users	Fixes	2020-06-29 09:57:21 +02:00
washing-machines	Fixes	2020-06-29 10:50:04 +02:00
washing-reservations	Merge remote-tracking branch 'origin/master'	2020-06-29 08:19:55 +02:00
index.blade.php	Added admin sites	2020-06-15 08:56:21 +02:00