hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-08-11 22:53:13 +02:00
parent 2899f152fb
commit 4fa1f613e4
35 changed files with 378 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -81,7 +81,7 @@
"vierbergenlars/php-semver" : "~2.1",
"zend/gdata" : "~1.12.1",
"doctrine/migrations" : "1.0.x-dev@dev",
willdurand/negotiation" : "~1.3"
"willdurand/negotiation" : "~1.3"
},
"require-dev": {
"phpunit/phpunit" : "~3.7",