summaryrefslogtreecommitdiffstats
path: root/Http/Firewall.php
diff options
context:
space:
mode:
authorBernhard Schussek <bernhard.schussek@symfony-project.com>2011-03-07 19:12:12 +0100
committerBernhard Schussek <bernhard.schussek@symfony-project.com>2011-03-07 19:15:57 +0100
commitdb1564445584b2bf354558534efa6532e8cb3959 (patch)
treec96825a33e5a3dcd79d678874ec0b1cfe365cb20 /Http/Firewall.php
parentc0b58aaf0672541eb7215d4018201b0e21ff957d (diff)
parentc224430de65547bc9a25293b6a8caf2b9029f05c (diff)
downloadsymfony-security-db1564445584b2bf354558534efa6532e8cb3959.zip
symfony-security-db1564445584b2bf354558534efa6532e8cb3959.tar.gz
symfony-security-db1564445584b2bf354558534efa6532e8cb3959.tar.bz2
Merge remote branch 'symfony/master' into event-manager
Diffstat (limited to 'Http/Firewall.php')
-rw-r--r--Http/Firewall.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/Firewall.php b/Http/Firewall.php
index 55d2b28..25d6b48 100644
--- a/Http/Firewall.php
+++ b/Http/Firewall.php
@@ -3,7 +3,7 @@
/*
* This file is part of the Symfony package.
*
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -25,7 +25,7 @@ use Doctrine\Common\EventManager;
* (a Basic authentication for the /api, and a web based authentication for
* everything else for instance).
*
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @author Fabien Potencier <fabien@symfony.com>
*/
class Firewall
{