Merge branch 'admin'

Conflicts: core/lib/Thelia/Command/AdminUpdatePasswordCommand.php core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
2013-10-30 15:37:33 +01:00
parent 78cba61cd5 e18c8992f8
commit eae231148e
2 changed files with 4 additions and 4 deletions
--- a/core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
+++ b/core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
@@ -97,4 +97,6 @@ class AdminUpdatePasswordCommand extends ContainerAwareCommand
        ));

    }
-}
+
+}
+
--- a/core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
+++ b/core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
@@ -81,7 +81,5 @@ class AdministratorUpdatePasswordEvent extends ActionEvent
        return $this->admin;
    }

+}

-
-
-}