Skip to content

Commit

Permalink
Revert to 3cc0696
Browse files Browse the repository at this point in the history
  • Loading branch information
Serhii Polishchuk committed May 3, 2016
1 parent 098c6a3 commit 3c8fd53
Show file tree
Hide file tree
Showing 3 changed files with 775 additions and 1,820 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: php
php:
- 5.4
- 5.5
- 5.6
- hhvm
- 7
# - 7

env:
- SYMFONY_VERSION=2.6.*
Expand Down
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"psr-0": { "": "src/", "SymfonyStandard": "app/" }
},
"require": {
"php": ">=5.5.0",
"symfony/symfony": "~2.8",
"php": ">=5.4.0",
"symfony/symfony": "2.6.9",
"symfony/assetic-bundle": "~2.3",
"symfony/swiftmailer-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4",
Expand All @@ -17,6 +17,7 @@
"doctrine/common": "2.5.1",
"doctrine/orm": "2.5.1",
"doctrine/doctrine-bundle": "1.5.2",
"doctrine/migrations": "1.0.*@dev",
"doctrine/doctrine-migrations-bundle": " 2.1.*@dev",
"doctrine/annotations": "1.2.7",
"doctrine/cache": "1.4.2",
Expand All @@ -28,6 +29,7 @@
"knplabs/knp-paginator-bundle": "2.4.*@dev",
"guzzlehttp/guzzle": "~5.0",
"twig/extensions": "~1.0",
"twig/twig": "1.22.1",
"nelmio/api-doc-bundle": "dev-master",
"sonata-project/admin-bundle": "~2.3",
"sonata-project/doctrine-orm-admin-bundle": "~2.3",
Expand Down Expand Up @@ -74,6 +76,9 @@
"symfony-assets-install": "relative",
"incenteev-parameters": {
"file": "app/config/parameters.yml"
},
"branch-alias": {
"dev-master": "2.6-dev"
}
}
}
Loading

0 comments on commit 3c8fd53

Please sign in to comment.