Merge branch 'master' into 1856-legislation_processes_proposals_phase

2017-09-21 21:24:56 +02:00
parent 536ee520e8 7fa21afa56
commit ac5620c583
142 changed files with 890 additions and 2049 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -434,7 +434,6 @@ Rails.application.routes.draw do
    resources :polls, only: [:index] do
      get :final, on: :collection

-      resources :final_recounts, only: [:new, :create]
      resources :results, only: [:new, :create, :index]
    end
    resource :residence, controller: "residence", only: [:new, :create]