jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
sw 2015-08-29 14:49:01 +08:00
parent 17e9b2d293 65756967ad
commit 6cb21d3430
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/show.html.erb
View File

@ -55,4 +55,4 @@
</div> </div>
</div> </div>
<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => @page} %> <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %>