summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 12:36:53 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 12:36:53 +0100
commit3f332fe2c8caea0dea445822e7004d9b8f5bebe1 (patch)
treeb33b42f6b14f359b7725eb71807a66f445ed55f3 /app/controllers
parentc563859fa60defd2b40f17a0b7cf1c4912f72792 (diff)
parent63339834ec520efae48f16f4d16b90d74e7bcdfd (diff)
Merge branch 'switchboard' into develop
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/switchboards_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/switchboards_controller.rb b/app/controllers/switchboards_controller.rb
index 8f21d5e..98008c1 100644
--- a/app/controllers/switchboards_controller.rb
+++ b/app/controllers/switchboards_controller.rb
@@ -9,6 +9,7 @@ class SwitchboardsController < ApplicationController
def show
@switchboard = @user.switchboards.find(params[:id])
+ @switchboard_entries = @switchboard.switchboard_entries
spread_breadcrumbs
end