Merge branch 'hjq_new_course' into szzh

Conflicts: public/stylesheets/public.css 处理冲突
2015-12-25 18:05:36 +08:00 · 2015-12-25 18:05:36 +08:00 · ce740170ca
parent 445d5dc379 cd36a6874e
commit ce740170ca
1 changed files with 1 additions and 0 deletions
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@ -81,6 +81,7 @@
                    <%= format_time(attachment.created_on) %>
                  </span>
                </div>
+                <div class="cl"></div>
            <% end %>
        <% end %>
      </div>