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

Fix merge 3.8

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-12-09 14:01:00 +01:00
parent 9f38823f27
commit 589169299c
29 changed files with 430 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -43,7 +43,7 @@
"imagine/imagine" : "dev-0.6.1-flatten-layer as 0.6.1",
"igorw/get-in" : "~1.0",
"ircmaxell/random-lib" : "~1.0",
"jms/serializer" : "~0.10",
"jms/serializer" : "~0.10",
"jms/translation-bundle" : "~1.1",
"justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0",
@@ -73,7 +73,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",