Merge branch 'master' into develop

2013-10-22 22:05:25 -05:00
parent ed78f78fa9 b2ac3197be
commit 5df7bc7f8a
2 changed files with 4 additions and 4 deletions
--- a/app/lang/en/reminders.php
+++ b/app/lang/en/reminders.php
@@ -13,7 +13,7 @@ return array(
 	|
 	*/

-	"password" => "Passwords must be six characters and match the confirmation.",
+	"password" => "Passwords must be at least six characters long and match the confirmation.",

 	"user"     => "We can't find a user with that e-mail address.",

--- a/public/.htaccess
+++ b/public/.htaccess
@@ -2,7 +2,7 @@
    Options -MultiViews
    RewriteEngine On

-	RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-d
    RewriteCond %{REQUEST_FILENAME} !-f
    RewriteRule ^ index.php [L]
 </IfModule>