Merge pull request #7593 from PalanteJon/CRM-17273-4.6
authorcolemanw <coleman@civicrm.org>
Thu, 14 Jan 2016 15:12:35 +0000 (10:12 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 14 Jan 2016 15:12:35 +0000 (10:12 -0500)
CRM-17273 - CiviCRM Core - disallow editing location types from the C…


Trivial merge