nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-20 08:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	.php_cs.cache
#	public/mix-manifest.json
#	resources/js/components/FilesView/FilePreviewMedia.vue
#	resources/js/components/Sidebar/SidebarNavigation.vue
#	resources/js/helpers.js
This commit is contained in:
Peter Papp
2021-05-06 16:06:17 +02:00
parent 69deafeda0 f252a0ba23
commit f5f0663d07
17 changed files with 482 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/language-translations.php
View File

@@ -571,6 +571,7 @@ return [
'shared_form.recipients_label' => 'Recipients',
'shared_form.share_by_email' => 'Share by Email',
'shared_form.share_by_link' => 'Share by Link',
'sidebar.sharing' => 'Sharing',
'sidebar.favourites' => 'Favourites',
'sidebar.favourites_empty' => 'Drag here your favourite folder.',
'sidebar.folders_empty' => 'Create some new folder.',