Symfony stable branch.

This commit is contained in:
Alexey Skobkin 2015-10-05 04:39:12 +03:00
parent 6819888c24
commit 893af94671
2 changed files with 8 additions and 9 deletions

View file

@ -8,7 +8,7 @@
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"symfony/symfony": "2.7.x-dev", "symfony/symfony": "2.7.*",
"doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/orm": "~2.2,>=2.2.3,<2.5",
"doctrine/dbal": "<2.5", "doctrine/dbal": "<2.5",
"doctrine/doctrine-bundle": "~1.4", "doctrine/doctrine-bundle": "~1.4",

15
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "afd173c98886e151c9bdd8b8e9fe6ea2", "hash": "2286e80d67065c2a2d2d6ded281d7856",
"content-hash": "8a8693220ed1993aefa0c00bab3f3e1a", "content-hash": "85908f5bb94b02d643b50978f064ca6e",
"packages": [ "packages": [
{ {
"name": "braincrafted/bootstrap-bundle", "name": "braincrafted/bootstrap-bundle",
@ -1728,16 +1728,16 @@
}, },
{ {
"name": "symfony/symfony", "name": "symfony/symfony",
"version": "2.7.x-dev", "version": "v2.7.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/symfony.git", "url": "https://github.com/symfony/symfony.git",
"reference": "2aeaa22e3171b5e1f10f2cc2a7ff7f6608b65f9d" "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/symfony/zipball/d1f50c5deecd6830ca30062e21b32c722272ca62", "url": "https://api.github.com/repos/symfony/symfony/zipball/a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486",
"reference": "2aeaa22e3171b5e1f10f2cc2a7ff7f6608b65f9d", "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1846,7 +1846,7 @@
"keywords": [ "keywords": [
"framework" "framework"
], ],
"time": "2015-05-25 07:45:54" "time": "2015-07-31 13:24:45"
}, },
{ {
"name": "theodordiaconu/geshi", "name": "theodordiaconu/geshi",
@ -2142,7 +2142,6 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"symfony/symfony": 20,
"theodordiaconu/geshi": 20, "theodordiaconu/geshi": 20,
"theodordiaconu/geshi-bundle": 20, "theodordiaconu/geshi-bundle": 20,
"braincrafted/bootstrap-bundle": 20, "braincrafted/bootstrap-bundle": 20,