Anders c2a90c69f9 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/resources/views/app/users/editpass.blade.php		2020-08-03 09:43:51 +02:00
..
admin	Fixed - Being able to change credentials without removing password	2020-07-31 11:14:24 +02:00
app	Merge remote-tracking branch 'origin/master'	2020-08-03 09:43:51 +02:00
user/layout	Fixes	2020-06-30 10:46:49 +02:00