Merge branch 'develop' into feature/follow-buttons

Conflicts:
	app/models/track_mailer.rb
	app/models/track_thing.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index 249030537..4059ac0bb 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -15,7 +15,7 @@ class AdminUserController < AdminController
     def list
         @query = params[:query]
         @admin_users = User.paginate :order => "name", :page => params[:page], :per_page => 100,
-            :conditions =>  @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or 
+            :conditions =>  @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or
                              lower(email) like lower('%'||?||'%')", @query, @query]
     end
 
@@ -28,7 +28,7 @@ class AdminUserController < AdminController
         # Don't use @user as that is any logged in user
         @admin_user = User.find(params[:id])
     end
-    
+
     def show_bounce_message
         @admin_user = User.find(params[:id])
     end
@@ -54,7 +54,7 @@ class AdminUserController < AdminController
         else
             render :action => 'edit'
         end
-    end 
+    end
 
     def destroy_track
         track_thing = TrackThing.find(params[:track_id].to_i)
@@ -62,7 +62,7 @@ class AdminUserController < AdminController
         flash[:notice] = 'Track destroyed'
         redirect_to user_admin_url(track_thing.tracking_user)
     end
-    
+
     def clear_bounce
         user = User.find(params[:id])
         user.email_bounced_at = nil