summaryrefslogtreecommitdiff
path: root/app/models/gateway_setting.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-20 19:06:19 +0200
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-20 19:06:19 +0200
commiteb0e1cc5c26275ff3e5c341404e8bc558f8312b8 (patch)
tree71f449ccd6f15422717de3ac24f87d5e888ddd79 /app/models/gateway_setting.rb
parentdf6e17e48995f25e72509986f30700d778b179b6 (diff)
parent3b27a5d45b12f6bac65da2a8e17387bfda42a2f1 (diff)
Merge branch 'develop'
Diffstat (limited to 'app/models/gateway_setting.rb')
-rw-r--r--app/models/gateway_setting.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb
index b412bc6..e96bb52 100644
--- a/app/models/gateway_setting.rb
+++ b/app/models/gateway_setting.rb
@@ -14,6 +14,10 @@ class GatewaySetting < ActiveRecord::Base
'contact' => 'String',
'dial_string' => 'String',
'profile' => 'String',
+ 'from' => 'String',
+ 'from_clir' => 'String',
+ 'asserted_identity' => 'String',
+ 'asserted_identity_clir' => 'String',
},
'xmpp' => {
'server' => 'String',