Skip to content

Commit

Permalink
Merge branch 'master' of github.com:concerto/concerto
Browse files Browse the repository at this point in the history
  • Loading branch information
brzaik committed Jul 6, 2012
2 parents 0c18141 + c6c6e3f commit 5e8594c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/feeds/_browse_body.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<article>
<ul class="SL">
<% @feeds.each do |feed| %>
<% unless feed.approved_contents.size == 0 %>
<% if feed.approved_contents.size != 0 || (feed.pending_contents.size != 0 && feed.group.has_member?(current_user) ) %>
<li>
<h3>
<%= link_to feed_submissions_path(feed), :remote => true, :class => "link-hl" do %>
Expand Down

0 comments on commit 5e8594c

Please sign in to comment.