projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4df3216 95cf5c2)
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-26-11-43-18
authorkurund <kurund@civicrm.org>
Tue, 26 Nov 2013 06:13:26 +0000 (11:43 +0530)
committerkurund <kurund@civicrm.org>
Tue, 26 Nov 2013 06:13:26 +0000 (11:43 +0530)
1  2 
CRM/Core/BAO/Phone.php patch | diff1 | diff2 | blob | history
CRM/Core/DAO.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/BAO/Phone.php
Simple merge
diff --cc CRM/Core/DAO.php
Simple merge