summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-27 20:59:32 +0200
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-27 20:59:32 +0200
commitd95155baebf7004bfc99c13545e343b8bd0882b6 (patch)
tree480d5bdf3f8e1354e56281d497300f776a1c980b /app/views
parentaad51572a6c75a4cbd2d44804b82f634a4ddd732 (diff)
parent51c51156e22b16fb5c120aed8dfef13a2d10b465 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/config_snom/show.xml.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index 22df8bc..8b501ab 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -37,6 +37,7 @@
%display_method{:perm => 'RW'}= 'display_name_number'
%callpickup_dialoginfo{:perm => 'RW'}= 'on'
%pickup_indication{:perm => 'RW'}= 'off'
+ %auto_connect_indication{:perm => 'RW'}= 'off'
%show_local_line{:perm => 'RW'}= 'off'
%mwi_notification{:perm => 'RW'}= 'silent'
%mwi_dialtone{:perm => 'RW'}= 'normal'