diff options
| author | nfoy <nfoy@purdue.edu> | 2014-03-06 20:40:18 -0500 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-03-06 20:40:18 -0500 |
| commit | a892016443d4845c1f738bcc57db82174c53701c (patch) | |
| tree | f05cfe552d4b7c6793b172aa6b92906a0b2241fa /config | |
| parent | e10bf58ec059ec263c1d1a9dcac608475377868a (diff) | |
| parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index 72445c8..a14c11a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,8 +16,8 @@ Leaguer::Application.routes.draw do resources :tournaments do resources :matches end - - resources :servers + + resource :server, only: [:show, :edit, :update] root to: 'static#homepage' |