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:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
This commit is contained in:
Romain Neutron
2013-10-28 18:21:15 +01:00
parent fd3bd29fd2 9d69c8dc3f
commit 96ac795d8d
10 changed files with 222 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

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