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/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-08 19:04:26 +01:00
parent f39af8b64e ea6b93b88a
commit 2072f9e0e0
68 changed files with 250 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -41,6 +41,7 @@
"themattharris/tmhoauth" : "~0.7",
"twig/twig" : "~1.14, >=1.14.2",
"twig/extensions" : "~1.0",
"vierbergenlars/php-semver" : "~2.1",
"zend/gdata" : "~1.12.1"
},
"require-dev": {