diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:48:24 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:48:24 -0500 |
| commit | 63830b0f939db5f6911218950525428420c4d467 (patch) | |
| tree | 76e525137c61235cf5c9e1beb8f54820df123058 /config | |
| parent | 8e1ca0e4f9107a43fbdf0dac315e3467b0158356 (diff) | |
| parent | d72452a5965c0df32a13053ae86bcd529fc0fc9e (diff) | |
Merge branch 'clean' into master2
Conflicts:
config/routes.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/routes.rb b/config/routes.rb index 2409eb2..0adafbe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,18 +7,10 @@ Leaguer::Application.routes.draw do resources :games - resources :pms - - resources :alerts - - resources :teams - resources :matches resources :tournaments - #set 'selected' to: 'tournaments#selected' via: 'get' - resources :servers root to: 'static#homepage' |