projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ffd3f4 fd54266)
Merge pull request #7764 from pradpnayak/CRM-16617-master
authorcolemanw <coleman@civicrm.org>
Wed, 30 Mar 2016 17:44:53 +0000 (13:44 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 30 Mar 2016 17:44:53 +0000 (13:44 -0400)
Crm 16617 master

1  2 
CRM/Core/DAO.php patch | diff1 | diff2 | blob | history
tests/phpunit/CRM/Core/DAOTest.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/DAO.php
Simple merge
diff --cc tests/phpunit/CRM/Core/DAOTest.php
Simple merge