frederikpyt 9b631843b0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/database/seeds/ContactSeeder.php		2020-08-05 13:30:32 +02:00
..
admin	v0.5.1 - Made contact phone number optional and updated data in seeders.	2020-08-05 13:29:45 +02:00
app	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-08-05 13:30:32 +02:00
user/layout	Fixes	2020-06-30 10:46:49 +02:00