Merge branch '2.3_branch'

This commit is contained in:
Dan Rice 2015-03-08 20:51:18 -04:00
commit 85603a2e79

View file

@ -1,7 +1,4 @@
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
map Rails.application.config.relative_url_root || "/" do
run Rails.application
end
run Rails.application