Merge pull request #1277 from nlegoff/locale39

[3.9] Fix locales extraction
This commit is contained in:
Nicolas Le Goff
2015-03-10 11:56:29 +01:00
14 changed files with 27280 additions and 26806 deletions

View File

@@ -21,6 +21,10 @@
{
"type": "vcs",
"url": "https://github.com/alchemy-fr/phpexiftool"
},
{
"type": "vcs",
"url": "https://github.com/alchemy-fr/JMSTranslationBundle"
}
],
"require": {
@@ -44,7 +48,7 @@
"igorw/get-in" : "~1.0",
"ircmaxell/random-lib" : "~1.0",
"jms/serializer" : "~0.10",
"jms/translation-bundle" : "~1.1",
"jms/translation-bundle" : "dev-master as 1.1.0",
"justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.4",