projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-15-16-31
[civicrm-core.git]
/
CRM
/
Admin
/
Page
/
Options.php
diff --git
a/CRM/Admin/Page/Options.php
b/CRM/Admin/Page/Options.php
index d9ca03f03c489dcb1ad5679a21265b78337d7977..4c4667feca305a25e1e2d98eae469f775cd45fea 100644
(file)
--- a/
CRM/Admin/Page/Options.php
+++ b/
CRM/Admin/Page/Options.php
@@
-116,6
+116,7
@@
class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
array(
'from_email_address', 'email_greeting',
'postal_greeting', 'addressee',
+ 'communication_style',
'case_status', 'encounter_medium',
'case_type', 'payment_instrument'
)