projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 335f816 529792d)
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-05-23-28-33
authorkurund <kurund@civicrm.org>
Mon, 5 Jan 2015 17:58:47 +0000 (23:28 +0530)
committerkurund <kurund@civicrm.org>
Mon, 5 Jan 2015 17:58:47 +0000 (23:28 +0530)
1  2 
CRM/Mailing/Form/Group.php patch | diff1 | diff2 | blob | history
js/Common.js patch | diff1 | diff2 | blob | history

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