projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1e593e e3e7a1d)
Merge pull request #4004 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:01:26 +0000 (10:01 +0100)
committercolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:01:26 +0000 (10:01 +0100)
Merge branch 4.4 into 4.5

1  2 
CRM/Export/BAO/Export.php patch | diff1 | diff2 | blob | history
CRM/Utils/Check/Security.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Export/BAO/Export.php
Simple merge
diff --cc CRM/Utils/Check/Security.php
Simple merge