Merge remote-tracking branch 'origin/develop' into develop

maxplanck-ie · Oct 4, 2018 · ac80561 · ac80561
2 parents a9109f1 + 284ba2a
commit ac80561
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/common/templates/login.html b/common/templates/login.html
@@ -27,11 +27,11 @@
         {% csrf_token %}
         <h2 class="form-signin-heading">Parkour</h2>
         <input type="text" class="form-control" id="id_username" name="username" placeholder="Email" required="" autofocus="" />
-        <input type="password" class="form-control" id="id_password" name="password" placeholder="Password-test" required=""/>
+        <input type="password" class="form-control" id="id_password" name="password" placeholder="Password" required=""/>
         <div class="text-center link-forgot-password">
             <a class="" href="{% url 'password_reset' %}">Forgot password?</a>
         </div>
-        <input class="btn btn-lg btn-primary btn-block" type="submit" value="Loginnnn" />
+        <input class="btn btn-lg btn-primary btn-block" type="submit" value="Login" />
         <input type="hidden" name="next" value="{{ next }}" />
     </form>
 </div>