Skip to content

Commit

Permalink
minor symfony#12433 [Bridge/Propel1] Changed deps to accepts all upco…
Browse files Browse the repository at this point in the history
…ming propel1 versions (hason)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes symfony#12433).

Discussion
----------

[Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions

Commits
-------

0bd19aa [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
  • Loading branch information
fabpot committed Nov 17, 2014
2 parents 8d18c98 + 0bd19aa commit fa71441
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"doctrine/dbal": "~2.2",
"doctrine/orm": "~2.2,>=2.2.3",
"monolog/monolog": "~1.3",
"propel/propel1": "1.6.*",
"propel/propel1": "~1.6",
"ircmaxell/password-compat": "1.0.*",
"ocramius/proxy-manager": ">=0.3.1,<0.4-dev"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Propel1/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"symfony/http-foundation": "~2.0",
"symfony/http-kernel": "~2.0",
"symfony/form": "~2.2",
"propel/propel1": "1.6.*"
"propel/propel1": "~1.6"
},
"require-dev": {
"symfony/stopwatch": "~2.2"
Expand Down

0 comments on commit fa71441

Please sign in to comment.