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.8'

Browse Source 
Conflicts:
	bin/console
	composer.lock
This commit is contained in:
Nicolas Le Goff
2014-01-31 14:59:53 +01:00
parent b0cb1ccc5c 142c221be2
commit 30078730ab
14 changed files with 584 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -24,7 +24,7 @@
"jms/serializer" : "~0.10",
"justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.4, >=0.4.3",
"media-alchemyst/media-alchemyst" : "~0.4, >=0.4.4",
"monolog/monolog" : "~1.3",
"mrclay/minify" : "~2.1.6",
"neutron/process-manager" : "~1.0",