fixing conflicts [#6]

2015-07-16 21:29:44 +02:00
parent e88832b5a3 f09f7a17c2
commit 75f1638cd6
23 changed files with 446 additions and 4 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,7 @@ Rails.application.routes.draw do

  # You can have the root of your site routed with "root"
  root 'welcome#index'
+  resources :debates

  # Example of regular route:
  #   get 'products/:id' => 'catalog#view'