aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/chouette_controller.rb
diff options
context:
space:
mode:
authorGuillaume2017-10-31 11:54:08 +0100
committerGuillaume2017-10-31 11:54:08 +0100
commitf201d7cdd68ca554e7a99eb791baf48a540b8978 (patch)
tree428c823e77c330cdc5ea85e03ff34805bdae854e /app/controllers/chouette_controller.rb
parent90173e6bdd12d1aabe68a0d28f4f228782d3adf0 (diff)
parent718d9ab7f8d5b1cd125ee341bd098c41615a0cbd (diff)
downloadchouette-core-f201d7cdd68ca554e7a99eb791baf48a540b8978.tar.bz2
Merge branch 'master' into 4755-page_for_validate_referential
Diffstat (limited to 'app/controllers/chouette_controller.rb')
-rw-r--r--app/controllers/chouette_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/chouette_controller.rb b/app/controllers/chouette_controller.rb
index dc9ab4fa5..1313aa7cc 100644
--- a/app/controllers/chouette_controller.rb
+++ b/app/controllers/chouette_controller.rb
@@ -1,6 +1,5 @@
-class ChouetteController < BreadcrumbController
+class ChouetteController < InheritedResources::Base
include ApplicationHelper
- include BreadcrumbHelper
include ReferentialSupport
end