From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 27 Mar 2015 22:16:36 +0000 (-0700)
Subject: Merge pull request #5453 from colemanw/CRM-16148
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bfe714ea5b2826b5b38c929ebf341b3d1d9aa29a;p=civicrm-core.git

Merge pull request #5453 from colemanw/CRM-16148

CRM-16148 - Show option names instead of ids in api explorer
---

bfe714ea5b2826b5b38c929ebf341b3d1d9aa29a
diff --cc sql/civicrm_generated.mysql
index 5ed06297f7,af2f2b5421..482a7dd0e7
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@@ -1448,11 -1448,11 +1448,11 @@@ UNLOCK TABLES
  /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
  /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
  
- -- Dump completed on 2015-03-17 17:14:33
+ -- Dump completed on 2015-03-25 11:47:21
  -- +--------------------------------------------------------------------+
 --- | CiviCRM version 3.4                                                |
 +-- | CiviCRM version 4.6                                                |
  -- +--------------------------------------------------------------------+
 --- | Copyright CiviCRM LLC (c) 2004-2010                                |
 +-- | Copyright CiviCRM LLC (c) 2004-2015                                |
  -- +--------------------------------------------------------------------+
  -- | This file is a part of CiviCRM.                                    |
  -- |                                                                    |