diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
| commit | a30350ac6e76c66d14f6d78ed2b5ae4e5799c79c (patch) | |
| tree | a2b7127366a1b9d8d5be9fcda5abefacef7d2579 /templates/feeds | |
| parent | d8f82d9d72eec6042536797f75e06a9296f4cc71 (diff) | |
| parent | 2470c543d60c96343a5b0fefe04464b5b445b859 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
devel/views.py
feeds.py
templates/devel/index.html
templates/packages/flag.html
templates/public/index.html
todolists/views.py
urls.py
Diffstat (limited to 'templates/feeds')
| -rw-r--r-- | templates/feeds/news_description.html | 2 | ||||
| -rw-r--r-- | templates/feeds/news_title.html | 2 | ||||
| -rw-r--r-- | templates/feeds/packages_description.html | 2 | ||||
| -rw-r--r-- | templates/feeds/packages_title.html | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html index a1e6446f..e75d0af7 100644 --- a/templates/feeds/news_description.html +++ b/templates/feeds/news_description.html @@ -1,3 +1,3 @@ {% load markup %} <p>{{obj.author.get_full_name}} wrote:</p> -{{ obj.content|markdown }} +{{ obj.content|markdown }}
\ No newline at end of file diff --git a/templates/feeds/news_title.html b/templates/feeds/news_title.html index d355de5b..7899fce3 100644 --- a/templates/feeds/news_title.html +++ b/templates/feeds/news_title.html @@ -1 +1 @@ -{{ obj.title }} +{{ obj.title }}
\ No newline at end of file diff --git a/templates/feeds/packages_description.html b/templates/feeds/packages_description.html index 6b9c47b3..cfc42616 100644 --- a/templates/feeds/packages_description.html +++ b/templates/feeds/packages_description.html @@ -1 +1 @@ -{{ obj.pkgdesc }} +{{ obj.pkgdesc }}
\ No newline at end of file diff --git a/templates/feeds/packages_title.html b/templates/feeds/packages_title.html index 5c54ba65..f92ac684 100644 --- a/templates/feeds/packages_title.html +++ b/templates/feeds/packages_title.html @@ -1 +1 @@ -{{ obj.pkgname }} {{ obj.full_version }} {{ obj.arch.name }} +{{ obj.pkgname }} {{ obj.full_version }} {{ obj.arch.name }}
\ No newline at end of file |