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

Merge branch '3.7'

Browse Source
This commit is contained in:
Romain Neutron
2012-12-17 15:30:05 +01:00
parent 5ba4b78062 8aa964d635
commit 0eaa5db98e
25 changed files with 269 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -14,8 +14,8 @@
"doctrine/orm": "2.2.2",
"gedmo/doctrine-extensions": "2.2.*",
"grom/silex-service-provider": "dev-master",
"mediavorus/mediavorus": "dev-master",
"media-alchemyst/media-alchemyst": "dev-master",
"mediavorus/mediavorus": "0.2.x-dev",
"media-alchemyst/media-alchemyst": "0.2.x-dev",
"monolog/monolog": "1.0.*",
"neutron/silex-badfaith-provider": "dev-master",
"neutron/silex-filesystem-provider": "dev-master",