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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php
This commit is contained in:
Romain Neutron
2013-12-03 21:32:46 +01:00
parent 766773da01 e70e35ae04
commit e0c1f600dd
7 changed files with 151 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -22,7 +22,7 @@
"jms/serializer" : "~0.10",
"justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.3.1",
"media-alchemyst/media-alchemyst" : "~0.4, >=0.4.3",
"monolog/monolog" : "~1.3",
"mrclay/minify" : "~2.1.6",
"neutron/process-manager" : "~1.0",
@@ -31,6 +31,7 @@
"neutron/sphinxsearch-api" : "~2.0.6",
"neutron/recaptcha" : "~0.1.0",
"neutron/temporary-filesystem" : "~2.1",
"php-ffmpeg/php-ffmpeg" : "~0.4, >=0.4.3",
"php-xpdf/php-xpdf" : "~0.2.1",
"phpexiftool/phpexiftool" : "~0.3",
"silex/silex" : "1.1.x-dev@dev",