Merge branch 'szzh' into develop

tmp v20151030_03
huang 10 years ago
commit 09335cf018

@ -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>

Loading…
Cancel
Save