symfony

Archived

This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

History

Fabien Potencier 2c9083a6e0 Merge branch '2.1' * 2.1: [FrameworkBundle] added support for URIs as an argument to HttpKernel::render() [FrameworkBundle] restricted the type of controllers that can be executed by InternalController [Process] Allow non-blocking start with PhpProcess Making it easier to grab the PR template. [Locale] fixed a test Fixed failing test fix double-decoding in the routing system Conflicts: src/Symfony/Component/Process/PhpProcess.php	2012-12-20 08:22:35 +01:00
..
Symfony	Merge branch '2.1'	2012-12-20 08:22:35 +01:00

Fabien Potencier 2c9083a6e0 Merge branch '2.1'

* 2.1:
  [FrameworkBundle] added support for URIs as an argument to HttpKernel::render()
  [FrameworkBundle] restricted the type of controllers that can be executed by InternalController
  [Process] Allow non-blocking start with PhpProcess
  Making it easier to grab the PR template.
  [Locale] fixed a test
  Fixed failing test
  fix double-decoding in the routing system

Conflicts:
	src/Symfony/Component/Process/PhpProcess.php

2012-12-20 08:22:35 +01:00

Symfony

Merge branch '2.1'

2012-12-20 08:22:35 +01:00