Merge remote-tracking branch 'origin/master'

8255313c · Weblate · 1b280774 · 7b1bd7ff · 8255313c · 8255313c
Commit 8255313c authored Oct 02, 2014 by Weblate
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

weblate/html/mail/merge_failure.html weblate/html/mail/merge_failure.html +1 -1

weblate/html/mail/merge_failure.txt weblate/html/mail/merge_failure.txt +1 -1

No files found.
--- a/weblate/html/mail/merge_failure.html
+++ b/weblate/html/mail/merge_failure.html
@@ -25,7 +25,7 @@
 {{ status }}
 </pre>

-{% with object.get_export_url as export_url %}
+{% with subproject.get_export_url as export_url %}
 {% if export_url %}
 <p>
 {% trans "Git repository with Weblate translations:" %}

--- a/weblate/html/mail/merge_failure.txt
+++ b/weblate/html/mail/merge_failure.txt
@@ -8,7 +8,7 @@

 {% trans "Repository status:" %}

-{{ status }}{% with object.get_export_url as export_url %}{% if export_url %}
+{{ status }}{% with subproject.get_export_url as export_url %}{% if export_url %}

 {% trans "Git repository with Weblate translations:" %}
 {{ export_url }}