Merge branch 'master' into feature/jinse
Showing
... | ... | @@ -22,7 +22,12 @@ |
"yiisoft/yii2-redis": "~2.0.0", | ||
"yiisoft/yii2-queue": "~2.0", | ||
"linslin/yii2-curl": "*", | ||
"voku/simple_html_dom": "^4.5" | ||
"voku/simple_html_dom": "^4.5", | ||
<<<<<<< HEAD | ||
"yiisoft/yii2-elasticsearch": "~2.0.0" | ||
======= | ||
"workerman/workerman": "^3.5" | ||
>>>>>>> master | ||
}, | ||
"require-dev": { | ||
"yiisoft/yii2-debug": "~2.0.0", | ||
... | ... |
Please
register
or
sign in
to comment