Merge remote branch 'crimer/master'

This commit is contained in:
Raphael 2010-10-11 10:03:09 -07:00
commit 04d5271530

View file

@ -10,7 +10,6 @@ class AlbumsController < ApplicationController
def index
@albums = current_user.albums_by_aspect(@aspect).paginate :page => params[:page], :per_page => 9, :order => 'created_at DESC'
@aspect = :all
respond_with @albums, :aspect => @aspect
end