Merge pull request #320 from dinbrca/master

Composer locks due to psr/log dependency version
This commit is contained in:
Chris Boulton 2017-04-12 14:58:19 -07:00 committed by GitHub
commit 968b7e6a30

View File

@ -21,7 +21,7 @@
"php": ">=5.3.0", "php": ">=5.3.0",
"ext-pcntl": "*", "ext-pcntl": "*",
"colinmollenhour/credis": "~1.7", "colinmollenhour/credis": "~1.7",
"psr/log": "1.0.0" "psr/log": "~1.0"
}, },
"suggest": { "suggest": {
"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.", "ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",