Merge branch 'master' into loops

This commit is contained in:
Etienne Roudeix
2013-07-24 11:33:38 +02:00
33 changed files with 10589 additions and 1058 deletions

View File

@@ -26,6 +26,7 @@ use Propel\Runtime\ActiveQuery\ModelCriteria;
use Symfony\Component\HttpKernel\HttpKernel;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;