projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88df926 99e2ac5)
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-23-19-26-23
authorkurund <kurund@civicrm.org>
Wed, 23 Oct 2013 14:10:44 +0000 (19:40 +0530)
committerkurund <kurund@civicrm.org>
Wed, 23 Oct 2013 14:10:44 +0000 (19:40 +0530)
commit13c1cf91881e22bbcc38024c645736a3fc6fad4a
tree658cad0313839730db0ccbe3516b166f22b33e48tree | snapshot (zip tar.gz)
parent88df926cccb652de90ef7cef72c4a36c5e9c807ccommit | diff
parent99e2ac5f3a2724efb94bd3c24eee037c115727c3commit | diff
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-23-19-26-23

Conflicts:
CRM/Upgrade/Incremental/php/FourThree.php
api/v2/Contact.php
api/v2/Contribution.php
api/v2/Event.php
api/v2/Participant.php
api/v2/Pledge.php
api/v2/PledgePayment.php
api/v3/utils.php
templates/CRM/common/SocialNetwork.tpl
CRM/Upgrade/Incremental/php/FourThree.php diff1 | diff2 | blob | history
api/v3/utils.php diff1 | diff2 | blob | history
templates/CRM/common/SocialNetwork.tpl diff1 | diff2 | blob | history