projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cc7665 60ec9f4)
Merge pull request #2102 from eileenmcnaughton/CRM-13744
authorcolemanw <coleman@civicrm.org>
Tue, 26 Nov 2013 23:59:23 +0000 (15:59 -0800)
committercolemanw <coleman@civicrm.org>
Tue, 26 Nov 2013 23:59:23 +0000 (15:59 -0800)
CRM-13744 permissions allow 'or' permissions - prevents regression on ev...

1  2 
api/v3/utils.php patch | diff1 | diff2 | blob | history
tests/phpunit/api/v3/ContactTest.php patch | diff1 | diff2 | blob | history
tests/phpunit/api/v3/UtilsTest.php patch | diff1 | diff2 | blob | history

diff --cc api/v3/utils.php
Simple merge
diff --cc tests/phpunit/api/v3/ContactTest.php
Simple merge
diff --cc tests/phpunit/api/v3/UtilsTest.php
Simple merge