From 9abffdfc8a6b39927d1b673aff1855d567155481 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 26 Apr 2017 22:48:28 +0530
Subject: [PATCH] Manual merge of develop into opennebula-integration

---
 .../ungleich/djangocms_blog/includes/blog_item.html | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
index 37b3ced8..4a708d41 100644
--- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
+++ b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
@@ -16,18 +16,7 @@
         </h2>
       </a>
       <p class="post-meta" style="font-size:0.9em;">
-        Posted
-        {% if post.author %}
-        by
-        <!-- <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}"> -->
-          {% if post.author.get_full_name %}
-          {{ post.author.get_full_name }}
-          {% else %}
-          {{ post.author }}
-          {% endif %}
-        <!-- </a> -->
-        {% endif %}
-        on {{ post.date_published|date:"DATE_FORMAT" }}
+        Posted on {{ post.date_published|date:"DATE_FORMAT" }}
       </p>
 
       <p class="post-subtitle">