Merge remote-tracking branch 'origin/master' into oasis

# Conflicts: # .php_cs.cache # public/mix-manifest.json # resources/js/components/FilesView/FilePreviewMedia.vue # resources/js/components/Sidebar/SidebarNavigation.vue # resources/js/helpers.js
2026-04-27 18:40:39 +00:00 · 2021-05-06 16:06:17 +02:00
parent 69deafeda0 f252a0ba23
commit f5f0663d07
17 changed files with 482 additions and 240 deletions
@@ -610,15 +610,6 @@ const routesUser = [
                    requiresAuth: true
                },
            },
-            {
-                name: 'SharedFiles',
-                path: '/platform/shared-files',
-                component: () =>
-                    import(/* webpackChunkName: "chunks/shared-files" */ './views/FilePages/SharedFiles'),
-                meta: {
-                    requiresAuth: true
-                },
-            },
            {
                name: 'Settings',
                path: '/platform/settings',