Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-06-24 14:56:09 +02:00
parent 4b033353bf
commit 5e2dd0216a
14 changed files with 203 additions and 269 deletions

View File

@@ -27,7 +27,6 @@
"url": "https://github.com/nlegoff/Media-Alchemyst"
}
],
"minimum-stability" : "dev",
"require": {
"php" : ">=5.4",
"alchemy/oauth2php" : "1.0.0",
@@ -89,12 +88,6 @@
"behat/mink-selenium2-driver" : "~1.0",
"fabpot/goutte" : "~1.0"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/alchemy-fr/tcpdf-clone"
}
],
"autoload": {
"psr-0": {
"" : "lib/classes",
@@ -104,7 +97,7 @@
"include-path": ["vendor/zend/gdata/library"],
"extra": {
"branch-alias": {
"dev-master": "3.9-dev"
"dev-master": "3.9.x-dev"
}
}
}