Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

This commit is contained in:
huang 2015-10-29 17:31:03 +08:00
commit 286b1a1f0d
1 changed files with 1 additions and 1 deletions

View File

@ -73,7 +73,7 @@
<%= l(:lable_course_end) %> <%= l(:lable_course_end) %>
</span> </span>
<% else %> <% else %>
<%= join_in_course_for_list(@course, User.current,['regular'])%> <%#= join_in_course_for_list(@course, User.current,['regular'])%>
<% end -%> <% end -%>
</div> </div>
</div> </div>