Anders dfd8420270 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/MenuPlan.php		2020-06-30 12:40:02 +02:00
..
js	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 10:15:56 +02:00
lang/en	Initial Commit	2020-06-08 10:04:45 +02:00
sass	Fixes and implementation of forgot password	2020-06-30 10:19:01 +02:00
views	Merge remote-tracking branch 'origin/master'	2020-06-30 12:40:02 +02:00