projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4628c16 b7a900d)
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05
authorkurund <kurund@civicrm.org>
Wed, 4 Mar 2015 13:22:06 +0000 (18:52 +0530)
committerkurund <kurund@civicrm.org>
Wed, 4 Mar 2015 13:22:06 +0000 (18:52 +0530)
Conflicts:
CRM/Mailing/BAO/Mailing.php
sql/civicrm_generated.mysql
xml/version.xml

1  2 
CRM/Mailing/Form/Group.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Mailing/Form/Group.php
Simple merge