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

# Conflicts:
#	composer.lock
This commit is contained in:
Peter Papp
2021-05-03 07:29:06 +02:00

View File

@@ -33,6 +33,7 @@
"league/flysystem-cached-adapter": "^1.1.0",
"madnest/madzipper": "^1.1.0",
"spatie/laravel-backup": "^6.15",
"spatie/laravel-tail": "^4.3",
"teamtnt/laravel-scout-tntsearch-driver": "^11.1.0",
"vimeo/psalm": "^4.7"
},