nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/social_authentication' into subscription

Browse Source 
# Conflicts:
#	.env.example
#	composer.lock
#	public/mix-manifest.json
#	resources/js/views/User/Password.vue
#	routes/api.php
#	src/App/Users/Actions/CreateNewUserAction.php
#	tests/App/Users/UserAccountTest.php
This commit is contained in:
Čarodej
2022-01-10 07:38:56 +01:00
parent 0b5fcfe676 f017be476f
commit 8a64fe070b
22 changed files with 481 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -23,6 +23,7 @@
"laravel/fortify": "^1.8.3",
"laravel/framework": "^8.77.1",
"laravel/sanctum": "^2.12.1",
"laravel/socialite": "^5.2",
"laravel/tinker": "^2.6.2",
"laravel/ui": "^3.3.1",
"league/flysystem-aws-s3-v3": "^1.0.29",