nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-16 10:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	public/mix-manifest.json
#	resources/js/components/FilesView/Option.vue
#	resources/js/components/Others/MobileNavigation.vue
This commit is contained in:
Peter Papp
2021-05-11 10:37:31 +02:00
parent a6db642db7 6e330046b3
commit a7a6ef9f0a
13 changed files with 169 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+6 -6
View File
@@ -230,16 +230,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.180.5",
"version": "3.180.6",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "948a4defbe2a571cc4460725015b8e98b7060f2d"
"reference": "1a836be14ba664ea11eb965dec77715e9e607013"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d",
"reference": "948a4defbe2a571cc4460725015b8e98b7060f2d",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1a836be14ba664ea11eb965dec77715e9e607013",
"reference": "1a836be14ba664ea11eb965dec77715e9e607013",
"shasum": ""
},
"require": {
@@ -314,9 +314,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.180.5"
"source": "https://github.com/aws/aws-sdk-php/tree/3.180.6"
},
"time": "2021-05-07T18:12:43+00:00"
"time": "2021-05-10T18:17:07+00:00"
},
{
"name": "bacon/bacon-qr-code",