TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'admin'

Browse Source 
Conflicts:
	core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
	core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
This commit is contained in:
Manuel Raynaud
2013-10-30 15:37:33 +01:00
parent 78cba61cd5 e18c8992f8
commit eae231148e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
View File

@@ -97,4 +97,6 @@ class AdminUpdatePasswordCommand extends ContainerAwareCommand
)); ));
} }
}
}

4
core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
View File

@@ -81,7 +81,5 @@ class AdministratorUpdatePasswordEvent extends ActionEvent
return $this->admin; return $this->admin;
} }
}
}