commit ad840585b4b96ed6aedabd133f0d826ab46bb99f
author Scott Baker <smbaker@gmail.com> Mon Jan 05 16:42:06 2015 -0800
committer Scott Baker <smbaker@gmail.com> Mon Jan 05 16:42:06 2015 -0800
tree 8fdb245995148e7475becf803a5904d0684947ed
parent b418d19e010c360af976b67d81d15d97c5a4cfce
parent 0178aea141b6a42cf90303acff619ca25da57172

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

planetstack/templates/admin/login.html

diff --git a/planetstack/templates/admin/login.html b/planetstack/templates/admin/login.html
index a165707..293834c 100644
--- a/planetstack/templates/admin/login.html
+++ b/planetstack/templates/admin/login.html
@@ -25,7 +25,12 @@
 {% endif %}
 
 {% if form.non_field_errors or form.this_is_the_login_form.errors %}
-{% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %}
+{% for error in form.non_field_errors %}
+<p class="errornote">
+    {{ error }}
+</p>
+{% endfor %}
+{% for error in form.this_is_the_login_form.errors %}
 <p class="errornote">
     {{ error }}
 </p>