diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-17 13:48:01 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-17 13:48:01 +0200 |
| commit | 53d15c7a478930c236ad4129d2e1a9ef2de16660 (patch) | |
| tree | 363741f1da75afc7ec836b638c2690663830ab38 /Core/Encoder | |
| parent | b6d302f1f0f1235aa376c180dcd289f38b3df70e (diff) | |
| parent | cf3838b220fe3fa6265e82b466699ec04a14566b (diff) | |
| download | symfony-security-53d15c7a478930c236ad4129d2e1a9ef2de16660.zip symfony-security-53d15c7a478930c236ad4129d2e1a9ef2de16660.tar.gz symfony-security-53d15c7a478930c236ad4129d2e1a9ef2de16660.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
[DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays
Removed unused use statements.
Make usleep longer and simplify assertions
Added japanese translation resource for security component.
[Yaml] Fixed the escaping of strings starting with a dash when dumping
Fix in ChainLoader.php
fixed wrong started states
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions