projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f936f18 491fb2c)
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-09-17-00-10
authorkurund <kurund@civicrm.org>
Tue, 10 Dec 2013 01:00:57 +0000 (17:00 -0800)
committerkurund <kurund@civicrm.org>
Tue, 10 Dec 2013 01:00:57 +0000 (17:00 -0800)
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml

1  2 
CRM/Core/BAO/UFGroup.php patch | diff1 | diff2 | blob | history
CRM/Dedupe/Merger.php patch | diff1 | diff2 | blob | history
sql/GenerateData.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/BAO/UFGroup.php
Simple merge
diff --cc CRM/Dedupe/Merger.php
Simple merge
diff --cc sql/GenerateData.php
Simple merge