CRM-12076 fix
authorPratik Joshi <pratik.joshi@webaccess.co.in>
Wed, 13 Mar 2013 12:08:54 +0000 (17:38 +0530)
committerPratik Joshi <pratik.joshi@webaccess.co.in>
Wed, 13 Mar 2013 12:08:54 +0000 (17:38 +0530)
commit1a9f6d0de8b53d59f8bffe4f54a9d91762e664da
tree4967e2ee228d6fae2166dc8a789a74db69780d25
parent14473d4b14dbe29fe2e59eb947fcb05191be0c19
CRM-12076 fix

Conflicts:

CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
CRM/Core/Payment.php
CRM/Upgrade/4.3.beta3.msg_template/civicrm_msg_template.tpl [new file with mode: 0644]
CRM/Upgrade/4.3.beta3.msg_template/message_templates/contribution_online_receipt_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.3.beta3.msg_template/message_templates/contribution_online_receipt_text.tpl [new file with mode: 0644]
CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
xml/templates/message_templates/contribution_online_receipt_html.tpl
xml/templates/message_templates/contribution_online_receipt_text.tpl