diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-18 17:00:23 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-18 17:00:23 +0200 |
| commit | a406f17bd63a506a3db3a0198fb34709aa6dd389 (patch) | |
| tree | 06f14b6eaf114073d8d71797460671af12276f1c | |
| parent | 53d15c7a478930c236ad4129d2e1a9ef2de16660 (diff) | |
| parent | 69b9208635f332d6e5eb99e43f10e927a00f9ba8 (diff) | |
| download | symfony-security-a406f17bd63a506a3db3a0198fb34709aa6dd389.zip symfony-security-a406f17bd63a506a3db3a0198fb34709aa6dd389.tar.gz symfony-security-a406f17bd63a506a3db3a0198fb34709aa6dd389.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
[DoctrineBridge] Added type check to prevent calling clear() on arrays
[Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
Fix docblock typo
Conflicts:
src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 6a47a7a..740d3d6 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -291,7 +291,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface } /** - * Checks whether remember-me capabilities where requested + * Checks whether remember-me capabilities were requested * * @param Request $request * |