diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
| commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
| tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /config | |
| parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
| parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/config/routes.rb b/config/routes.rb index 149c321..876667f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,18 +1,4 @@ Leaguer::Application.routes.draw do - resources :games - - resources :pms - - resources :alerts - - resources :teams - - resources :matches - - resources :tournaments - - resources :servers - # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". |