Merge pull request #5453 from colemanw/CRM-16148
authorDave Greenberg <dave@civicrm.org>
Fri, 27 Mar 2015 22:16:36 +0000 (15:16 -0700)
committerDave Greenberg <dave@civicrm.org>
Fri, 27 Mar 2015 22:16:36 +0000 (15:16 -0700)
commitbfe714ea5b2826b5b38c929ebf341b3d1d9aa29a
tree0c387ef56163add90f93969f5cec8dd8de787b9b
parente7112fa7e47b60bc62f543f89c63f1e024546995
parent2e26e3ba8b08bfc1cf25d4b03a8b15f4343fb1b9
Merge pull request #5453 from colemanw/CRM-16148

CRM-16148 - Show option names instead of ids in api explorer
CRM/Core/DAO.php
CRM/Core/PseudoConstant.php
api/v3/Generic.php
sql/civicrm_generated.mysql
xml/templates/civicrm_data.tpl