Merge branch '2.1' into 2.2

Browse Source

* 2.1:
  fix overwriting of request's locale if attribute _locale is missing

...

This commit is contained in:

Fabien Potencier 2013-04-17 07:39:09 +02:00

parent fd58a5f424 580b249310

commit 2cd4b8e9b0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available