Merge branch 'hjq_new_course' into szzh

Conflicts:
	public/stylesheets/public.css

处理冲突
chenlw_dev
huang 10 years ago
commit ce740170ca

@ -81,6 +81,7 @@
<%= format_time(attachment.created_on) %>
</span>
</div>
<div class="cl"></div>
<% end %>
<% end %>
</div>

Loading…
Cancel
Save