diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-04-01 10:05:23 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-04-01 10:05:23 +0200 |
| commit | d3546e40687355c6d2567d1f28a021679c0f959c (patch) | |
| tree | ad2c3adf6a7f552a15a38de653c4bdcca2624a32 /Tests/Http/FirewallMapTest.php | |
| parent | 47304a0da6a25e5b0bbfbc5e7f9684f8b43ea688 (diff) | |
| parent | 12797cca335cb5f7652cc09dd7148cc413160150 (diff) | |
| download | symfony-security-d3546e40687355c6d2567d1f28a021679c0f959c.zip symfony-security-d3546e40687355c6d2567d1f28a021679c0f959c.tar.gz symfony-security-d3546e40687355c6d2567d1f28a021679c0f959c.tar.bz2 | |
merge branch '2.1' into 2.2
* 2.1:
fixed doc references (closes #7515)
small changes
[SecurityBundle] Fixed configuration exemple
idAsIndex should be true with a smallint or bigint id field.
Fixed long multibyte parameter logging in DbalLogger:startQuery
Keep the file extension in the temporary copy and test that it exists (closes #7482)
[Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
Conflicts:
src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
Diffstat (limited to 'Tests/Http/FirewallMapTest.php')
0 files changed, 0 insertions, 0 deletions