Merge branch 'jkb' into test
# Conflicts: # composer.json
Showing
... | ... | @@ -24,7 +24,7 @@ |
"hyperf/service-governance": "~1.1.0", | ||
"fzaninotto/faker": "^1.9", | ||
"phpoffice/phpspreadsheet": "^1.8", | ||
"chumper/zipper": "1.0.3" | ||
"dimsav/unix-zipper": "dev-master" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
... | ... |
Please register or sign in to comment