diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-06-29 07:41:56 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-06-29 07:41:56 +0200 |
commit | ad26beddbb9a24638754523d7232daab3580e4ae (patch) | |
tree | 6f4f79d41dd38f0d709d8ee251c68c20801d7022 /Core/User | |
parent | cc882b6a2f23f4d670267ef31c4c46f3e2d36040 (diff) | |
parent | a06fcc9cfb7b9d1b51b59952df65ad8fcfdf17ac (diff) | |
download | symfony-security-ad26beddbb9a24638754523d7232daab3580e4ae.zip symfony-security-ad26beddbb9a24638754523d7232daab3580e4ae.tar.gz symfony-security-ad26beddbb9a24638754523d7232daab3580e4ae.tar.bz2 |
Merge branch '3.0' into 3.1
* 3.0:
fixed CS
fixed CS
fixed form tests
[Console] Fix formatting of SymfonyStyle::comment()
[Form] fix post max size translation type extension for >= 2.8
removed dots at the end of @param and @return
fixed typo
Diffstat (limited to 'Core/User')
-rw-r--r-- | Core/User/InMemoryUserProvider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php index c1981de..e09d72e 100644 --- a/Core/User/InMemoryUserProvider.php +++ b/Core/User/InMemoryUserProvider.php @@ -97,7 +97,7 @@ class InMemoryUserProvider implements UserProviderInterface /** * Returns the user by given username. * - * @param string $username The username. + * @param string $username The username * * @return User * |