mirror of
https://github.com/Seldaek/monolog.git
synced 2025-10-22 17:16:18 +02:00
Merge remote-tracking branch 'mabrahamde/master'
Conflicts: composer.json
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~4.5",
|
"phpunit/phpunit": "~4.5",
|
||||||
"graylog2/gelf-php": "~1.0",
|
"graylog2/gelf-php": "~1.0",
|
||||||
"raven/raven": "~0.5",
|
"raven/raven": "~0.8",
|
||||||
"ruflin/elastica": ">=0.90 <3.0",
|
"ruflin/elastica": ">=0.90 <3.0",
|
||||||
"doctrine/couchdb": "~1.0@dev",
|
"doctrine/couchdb": "~1.0@dev",
|
||||||
"aws/aws-sdk-php": "~2.4, >2.4.8",
|
"aws/aws-sdk-php": "~2.4, >2.4.8",
|
||||||
|
Reference in New Issue
Block a user