diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /config/routes.rb | |
parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 1ce6e05..d7807f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ Leaguer::Application.routes.draw do resource :server, only: [:show, :edit, :update] - root to: 'static#homepage' + root to: 'main#homepage' get '/search', to: 'search#go' |