Merge pull request #9420 from eileenmcnaughton/settings
authorTim Otten <totten@civicrm.org>
Tue, 14 Mar 2017 05:09:16 +0000 (22:09 -0700)
committerGitHub <noreply@github.com>
Tue, 14 Mar 2017 05:09:16 +0000 (22:09 -0700)
commit4d931c5dc10b019ba6e62f7f21d19b940629640e
treee1ad0dfc3b4ba2084c3f3e1f093a6ca52a88ff29
parentb4465ed3681e88f8c9d91cee96fbcb7709b745ac
parentf2d12098420a3a0957017da6e062f1279f5918b8
Merge pull request #9420 from eileenmcnaughton/settings

Settings