projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cfd4a6 3e1fa09)
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-20-19-00-14
authorkurund <kurund@civicrm.org>
Tue, 21 Jan 2014 03:00:20 +0000 (19:00 -0800)
committerkurund <kurund@civicrm.org>
Tue, 21 Jan 2014 03:00:20 +0000 (19:00 -0800)
1  2 
CRM/Contact/Selector.php patch | diff1 | diff2 | blob | history
api/v3/Profile.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/Selector.php
Simple merge
diff --cc api/v3/Profile.php
Simple merge