Merge pull request #4913 from colemanw/INFRA-132
authorcolemanw <coleman@civicrm.org>
Mon, 12 Jan 2015 23:02:17 +0000 (18:02 -0500)
committercolemanw <coleman@civicrm.org>
Mon, 12 Jan 2015 23:02:17 +0000 (18:02 -0500)
INFRA-132 - Remove @static annotation

1  2 
CRM/ACL/API.php
CRM/Activity/Form/Activity.php
api/api.php
api/v3/CaseType.php
api/v3/Contact.php
api/v3/Contribution.php
api/v3/PaymentProcessorType.php
api/v3/Pledge.php
api/v3/RelationshipType.php
api/v3/SurveyRespondant.php
api/v3/utils.php

diff --cc CRM/ACL/API.php
Simple merge
Simple merge
diff --cc api/api.php
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge