Merge branch 'master' into devel

This commit is contained in:
Devin Howard 2013-01-24 19:53:07 -05:00
commit 0ad2392af5

View file

@ -22,7 +22,7 @@ class SessionsController < ApplicationController
@user = User.new @user = User.new
@map = Map.first(:conditions => [ "id = ?", 5]) @map = Map.first(:conditions => [ "id = ?", 5])
if @map if @map
respond_with(@user, @session, location: map_url(@map)) do |format| respond_with(@user, @session, location: map_url(@map)) do |format|