Skip to content

Commit

Permalink
Merge remote branch 'lindseyb/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed Mar 24, 2011
2 parents a389f91 + fb001c3 commit 4a6fcf2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rstatus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ class Rstatus < Sinatra::Base
params[:per_page] ||= 20
params[:page] = params[:page].to_i
params[:per_page] = params[:per_page].to_i
feeds = User.first(:username => params[:name]).following
feeds = User.first(:username => params[:name]).followers

@users = feeds.paginate(:page => params[:page], :per_page => params[:per_page])

Expand Down

0 comments on commit 4a6fcf2

Please sign in to comment.