Skip to content

jity
jity
Commit d7493c0a authored by Hermann Mayer's avatar Hermann Mayer
Browse files
Options

Updated Composer. Merged Entities with Master.

parent 44ecea8f
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
bin/composer.phar
View file @ d7493c0a
No preview for this file type
composer.lock
View file @ d7493c0a
......@@ -423,18 +423,18 @@
"source": {
"type": "git",
"url": "https://github.com/excelwebzone/EWZRecaptchaBundle",
"reference": "80702aa5a98fc462c805f8b56b77f66c1c88f91e"
"reference": "a97e18c509944dc385043fce6fe781a012181333"
},
"dist": {
"type": "zip",
"url": "https://github.com/excelwebzone/EWZRecaptchaBundle/archive/80702aa5a98fc462c805f8b56b77f66c1c88f91e.zip",
"reference": "80702aa5a98fc462c805f8b56b77f66c1c88f91e",
"url": "https://github.com/excelwebzone/EWZRecaptchaBundle/archive/a97e18c509944dc385043fce6fe781a012181333.zip",
"reference": "a97e18c509944dc385043fce6fe781a012181333",
"shasum": ""
},
"require": {
"symfony/framework-bundle": "2.*"
},
"time": "1352571100",
"time": "1352817567",
"type": "symfony-bundle",
"installation-source": "source",
"autoload": {
......@@ -601,13 +601,13 @@
"source": {
"type": "git",
"url": "git://gitorious.hermann-mayer.net/jity/jity-tag-generator.git",
"reference": "bdf9d8cc6982b2fe9ab062d22a5e8d9922c2aa95"
"reference": "8e2f9e282f67ddfaae1a3d5515e3991b771734a4"
},
"require": {
"php": ">=5.3.0",
"doctrine/common": ">=2.3.0"
},
"time": "1352649732",
"time": "1352851902",
"type": "library",
"installation-source": "source",
"autoload": {
......@@ -897,12 +897,12 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
"reference": "991e3ffb53255ebae20f1f6d3fb70b3830eafb0a"
"reference": "6305e18a3f5546af9bebba978357ac33d749dc07"
},
"dist": {
"type": "zip",
"url": "https://github.com/schmittjoh/JMSSerializerBundle/archive/991e3ffb53255ebae20f1f6d3fb70b3830eafb0a.zip",
"reference": "991e3ffb53255ebae20f1f6d3fb70b3830eafb0a",
"url": "https://github.com/schmittjoh/JMSSerializerBundle/archive/6305e18a3f5546af9bebba978357ac33d749dc07.zip",
"reference": "6305e18a3f5546af9bebba978357ac33d749dc07",
"shasum": ""
},
"require": {
......@@ -925,7 +925,7 @@
"suggest": {
"symfony/framework-bundle": "2.*"
},
"time": "1352370215",
"time": "1352924640",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment