CRM-16373 - settings - Declare mailer settings
authorTim Otten <totten@civicrm.org>
Sat, 15 Aug 2015 11:45:54 +0000 (04:45 -0700)
committerTim Otten <totten@civicrm.org>
Thu, 17 Sep 2015 22:45:00 +0000 (15:45 -0700)
commit988689cccc85587160bc2c37d0a5101c1991f9c3
tree9ed9a5f4dd01c8b233f0ff4649ae2af7151cac18
parent3d31a5c6761c983f1b8fc4ba65e5b0db7ce29147
CRM-16373 - settings - Declare mailer settings

Conflicts:
settings/Mailing.setting.php
CRM/Admin/Form/Setting/Mail.php
CRM/Mailing/Config.php
settings/Mailing.setting.php