Sebastian Davaris 79e5e95695 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/public/css/admin.css		2020-07-27 08:25:42 +02:00
..
factories	…
migrations	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-07-27 08:25:42 +02:00
seeds	Made role controller, added index and create	2020-06-30 11:30:12 +02:00
.gitignore	…