From 5bbb5d474807a01d1f1b3cdccacc0661bc92e57f Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Thu, 16 Jan 2014 16:16:44 -0500
Subject: [PATCH] =?UTF-8?q?Show=20=E2=80=9Cor=20email=20address=E2=80=9D?=
 =?UTF-8?q?=20in=20the=20placeholder=20for=20the=20username=20box?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/directives/signin-form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/directives/signin-form.html b/static/directives/signin-form.html
index cf982f08b..814955ce6 100644
--- a/static/directives/signin-form.html
+++ b/static/directives/signin-form.html
@@ -1,7 +1,7 @@
 <div class="signin-form-element">
   <form class="form-signin" ng-submit="signin();">
     <input type="text" class="form-control input-lg" name="username"
-           placeholder="Username" ng-model="user.username" autofocus>
+           placeholder="Username or E-mail Address" ng-model="user.username" autofocus>
     <input type="password" class="form-control input-lg" name="password"
            placeholder="Password" ng-model="user.password">
     <button class="btn btn-lg btn-primary btn-block" type="submit">Sign In</button>