summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-31 11:40:09 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-31 11:40:09 +0100
commit52f7cff0795a42da30f18033bde3633f985539b0 (patch)
tree9ffca1c369768dac2b43e18a5993da3db3eb3a50 /config
parent83120928fc2dabe225215668943452065d8bc52f (diff)
parent8da882cf3ec53f9057b17bd8dd39c2eadb2a88c2 (diff)
Merge branch 'auth' into develop
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 9d47efc..a0ac93a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -112,7 +112,7 @@ Gemeinschaft42c::Application.routes.draw do
end
resources :gemeinschaft_setups, :only => [:new, :create]
-
+
resources :phone_number_ranges, :only => [] do
resources :phone_numbers do
member do
@@ -228,9 +228,6 @@ Gemeinschaft42c::Application.routes.draw do
root :to => "page#index"
- get "wizards/new_initial_setup"
- post "wizards/create_initial_setup"
-
resources :users do
# Display all phone books that the current user owns:
resources :phone_books