Merge branch '1.3.x'

Conflicts: Controller/ChangePasswordController.php Controller/GroupController.php Controller/ProfileController.php Controller/RegistrationController.php Controller/ResettingController.php Controller/SecurityController.php Resources/views/layout.html.twig
msalsas · May 25, 2013 · 9e60b38 · 9e60b38
2 parents 7015f82 + 90cb9c1
commit 9e60b38
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Antoine Hérault <[email protected]>

diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * CreateUserCommand

diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Matthieu Bontemps <[email protected]>

diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Antoine Hérault <[email protected]>