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.lock
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
This commit is contained in:
Romain Neutron
2013-10-31 15:52:12 +01:00
parent 35c09961e5 5abb0665ee
commit 4ca6170cae
4 changed files with 220 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -39,7 +39,7 @@
"symfony/symfony" : "2.4.x-dev",
"alchemy-fr/tcpdf-clone" : "~6.0",
"themattharris/tmhoauth" : "~0.7",
"twig/twig" : "~1.13.0",
"twig/twig" : "~1.14, >=1.14.2",
"twig/extensions" : "~1.0",
"zend/gdata" : "~1.12.1"
},