Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history 
* 2.0:
  Revert "merged branch vatson/2.0 (PR sensiolabs#117)"
  [ParamConverter] "entity_manager" is not a required option for every configuration
  • Loading branch information
@fabpot
fabpot committed Apr 30, 2012
2 parents 225f053 + 1eda94d commit ab31304
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ab31304

Please sign in to comment.