Marcus Efraimsson cd61d2b237 Merge branch 'master' into 7883_new_url_structure 8 years ago
..
settings.html d74a98feff dashfolders: link to folder for inherited permissions 8 years ago
settings.ts cd61d2b237 Merge branch 'master' into 7883_new_url_structure 8 years ago