Merge branch 'master' of github.com:graaff/tracks

Conflicts:
	app/views/todos/_todo.html.erb
This commit is contained in:
Hans de Graaff 2009-12-06 09:41:20 +01:00
commit 18146fbbca

View file

@ -29,7 +29,6 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
<%= grip_span %>
<%= date_span -%>
<span class="todo.descr"><%= sanitize(todo.description) %></span>
<span class="todo.descr"><%= h sanitize(todo.description) %></span>
<% #= successors_span %>
<%= image_tag_for_recurring_todo(todo) if @todo.from_recurring_todo? %>
<%= tag_list %>