Merge branch 'master' into develop

3ee17a92 · Taylor Otwell · f6b347b9 · b363f3d1 · 3ee17a92
Commit 3ee17a92 authored Aug 22, 2014 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

reminders.php resources/lang/en/reminders.php +2 -0

No files found.
--- a/resources/lang/en/reminders.php
+++ b/resources/lang/en/reminders.php
@@ -21,4 +21,6 @@ return array(
 	"sent" => "Password reminder sent!",
+	"reset" => "Password has been reset!",
 );