Merge branch 'szzh' into develop

2015-10-30 19:04:16 +08:00 · 2015-10-30 19:04:16 +08:00 · 09335cf018
parent db5b1e4192 0fb48a41cb
commit 09335cf018
1 changed files with 1 additions and 1 deletions
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@ -73,7 +73,7 @@
 			<%= l(:lable_course_end)  %>
 		</span>
      <% else %>
-          <%#= join_in_course_for_list(@course, User.current,['regular'])%>
+          <%= join_in_course_for_list(@course, User.current,['regular'])%>
      <% end -%>
 	</div>
 </div>