Merge branch 'master' into devel

2013-01-24 19:53:07 -05:00 · 2013-01-24 19:53:07 -05:00 · 0ad2392af5
commit 0ad2392af5
parent c9614e33e3 87b2526373
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@ -22,7 +22,7 @@ class SessionsController < ApplicationController
    
    @user = User.new
 	
-	  @map = Map.first(:conditions => [ "id = ?", 5])
+    @map = Map.first(:conditions => [ "id = ?", 5])
 		
    if @map
      respond_with(@user, @session, location: map_url(@map)) do |format|