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 '4.0'

Browse Source 
Also updated dependencies
This commit is contained in:
Benoît Burnichon
2016-02-28 23:31:16 +01:00
parent 7ee7d1ca74 9999ceda12
commit 5975178749
22 changed files with 2537 additions and 2279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -30,7 +30,7 @@
"require": {
"php": ">=5.5",
"alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^0.2.0",
"alchemy/embed-bundle": "^0.3.2",
"alchemy/geonames-api-consumer": "~0.1.0",
"alchemy/google-plus-api-client": "~0.6.2",
"alchemy/mediavorus": "^0.4.4",