merge master

2016-07-14 13:22:24 +02:00
parent 59536ab189
commit f5868a4fa2
29 changed files with 78 additions and 351 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -99,5 +99,4 @@ Rails.application.routes.draw do
    end
  end

-  resources :teams
 end