projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e810b3b ae5a48c)
Merge pull request #5550 from civicrm/4.5
authorcolemanw <coleman@civicrm.org>
Thu, 2 Apr 2015 23:22:59 +0000 (19:22 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 2 Apr 2015 23:22:59 +0000 (19:22 -0400)
Merge branch 4.5 into 4.6

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

diff --cc CRM/Core/DAO/permissions.php
Simple merge