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)
commit162e97471c8eed5cbae5c53de7decd7706ae3fc3
tree4e8e6aab1b94e1dade0de1d56eb4761be2bc2018
parent0cc7665a9e8b7e6c10fd6fe77505790a93cdc9f9
parent60ec9f43970da556243e3da70e9dd662fa08ebfc
Merge pull request #2102 from eileenmcnaughton/CRM-13744

CRM-13744 permissions allow 'or' permissions - prevents regression on ev...
api/v3/utils.php
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/UtilsTest.php