Merge branch 'master' into openid
[rails.git] / app / views / diary_entry / _diary_list_entry.html.erb
1 <%= user_thumbnail diary_list_entry.user, :style => "float: right" %>
2 <%= render :partial => "diary_entry", :object => diary_list_entry %>