From: Christopher Allan Webber Date: Thu, 19 Sep 2013 23:01:49 +0000 (-0500) Subject: Fixing error caused by merge (failure to build password editing url) X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=63856d4f56e68f4b31fb2b6422a8e9908ee500ef;p=mediagoblin.git Fixing error caused by merge (failure to build password editing url) This commit sponsored by Kim Lindberger. Thank you! --- diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index f9e75890..574fe459 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -60,7 +60,7 @@ {% if pass_auth is defined %} · - + {% trans %}Password{% endtrans %} {% endif %}