diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 12:21:50 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 12:21:50 +0100 |
| commit | f85bb3c49ee0bac3be836628685fe080da78e823 (patch) | |
| tree | 9f36ecff843ff02d0b23760044d364797f9c82fc /app | |
| parent | 45883189e5708d68fb41fdbd153c4875c41b02b1 (diff) | |
| parent | 131d204324062991c93cd5418d1dc7854347ffb6 (diff) | |
Merge branch 'snom_meeting_point' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/config_snom_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb index 4d12082..7542415 100644 --- a/app/controllers/config_snom_controller.rb +++ b/app/controllers/config_snom_controller.rb @@ -80,6 +80,7 @@ class ConfigSnomController < ApplicationController '00041345' => 'Snom 821', '00041348' => 'Snom 821', '00041341' => 'Snom 870', + '00041332' => 'snom MeetingPoint', } @phone.phone_model = PhoneModel.where(:name => mac_address_to_model[@mac_address[0, 8]]).first |