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 latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-19 16:11:27 +02:00
parent a8da584666
commit 1250f8ab0b
60 changed files with 880 additions and 2417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.lock generated
View File

@@ -4930,7 +4930,7 @@
"silex/web-profiler": 20,
"doctrine/migrations": 20,
"behat/behat": 20,
"behat/gherkin": 20
"behat/gherkin": 20,
"mediavorus/mediavorus": 20,
"media-alchemyst/media-alchemyst": 20,
"php-ffmpeg/php-ffmpeg": 20,