diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
| commit | c6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (patch) | |
| tree | 138b206e95b7ec98ad9d319dd95157a2028b4cd1 /templates/feeds/news_description.html | |
| parent | 81a4f3e5e602d900ebfb2c20eb7565fddfb013a2 (diff) | |
| parent | c910b9220c45eb9d493d260f325efda2141205a4 (diff) | |
Merge branch 'archweb-generic' into master-nomake
# Conflicts:
# public/views.py
Diffstat (limited to 'templates/feeds/news_description.html')
| -rw-r--r-- | templates/feeds/news_description.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html deleted file mode 100644 index 61ceedf3..00000000 --- a/templates/feeds/news_description.html +++ /dev/null @@ -1,2 +0,0 @@ -<p>{{obj.author.get_full_name}} wrote:</p> -{{ obj.html }} |