Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2014-03-01 10:15:10 +08:00
commit b841f0c78a
1 changed files with 4 additions and 3 deletions

View File

@ -107,10 +107,11 @@
<!--homework--> <!--homework-->
<div class="user_fans"> <div class="user_fans">
<div class="user_underline"></div>
<div class="font_title_left"> <div class="font_title_left">
<strong><%= l(:label_commit_homework) %></strong> <strong><%= l(:label_commit_homework) %></strong>
</div> </div>
<div class="user_underline"></div>
<div class="left_wf"> <div class="left_wf">
<table> <table>
<tr> <tr>