projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da278dd 3091c98)
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-28-14-52-15
authorkurund <kurund@civicrm.org>
Mon, 28 Oct 2013 09:24:25 +0000 (14:54 +0530)
committerkurund <kurund@civicrm.org>
Mon, 28 Oct 2013 09:24:25 +0000 (14:54 +0530)
Conflicts:
templates/CRM/common/SocialNetwork.tpl

1  2 
templates/CRM/common/SocialNetwork.tpl patch | diff1 | diff2 | blob | history