Merge remote-tracking branch 'origin/master' into stable-production

2018-05-14 21:14:40 +02:00
parent 745c4413f4 28906eb5fb
commit 1b91d99b24
1 changed files with 1 additions and 1 deletions
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -33,7 +33,7 @@
 				</div>

 			</div>
-			<% unless @calentries.nil? or @calentries.empty? or True%>
+			<% unless @calentries.nil? or @calentries.empty? or true%>
 			<div class="span3">
 <% unless @calentries.nil? or @calentries.empty? %>
 				<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>