summaryrefslogtreecommitdiff
path: root/httemplate/pref/pref-process.html
diff options
context:
space:
mode:
authorRob Van Dam <rvandam00@gmail.com>2013-11-07 15:27:24 -0700
committerRob Van Dam <rvandam00@gmail.com>2013-11-07 15:27:24 -0700
commitdf1ebf662a9fc3f89503036e0dbf6833c1b95f9e (patch)
treef62eafd9d77427277e6aaa4353fb3bf8567926fd /httemplate/pref/pref-process.html
parent45cd27b19e8ad50f835915746fb89e486cbb69c0 (diff)
parenta180208786cccb72ab017e39fff0cb128aa6ba01 (diff)
Merge remote-tracking branch 'upstream/master'
Conflicts: FS/FS/cust_pkg.pm
Diffstat (limited to 'httemplate/pref/pref-process.html')
-rw-r--r--httemplate/pref/pref-process.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 962ee51b6..7edf8921c 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -54,6 +54,7 @@ unless ( $error ) { # if ($access_user) {
spreadsheet_format mobile_menu
enable_fuzzy_on_exact
disable_html_editor disable_enter_submit_onetimecharge
+ enable_mask_clipboard_hack
email_address
snom-ip snom-username snom-password
vonage-fromnumber vonage-username vonage-password