merges master and fix conflicts

2015-08-25 19:31:25 +02:00
parent 8bdf03c50d 44ec0cb76d
commit c183cf2cc6
41 changed files with 572 additions and 96 deletions
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -14,7 +14,7 @@
        <% if comment.user.organization? %>
          <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %>
        <% else %>
-          <%= avatar_image(comment.user, size: 32, class: "left") %>
+          <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %>
        <% end %>
        <% if comment.user.hidden? %>
          <i class="icon-deleted user-deleted"></i>