Merge pull request #6412 from colemanw/CRM-11369
authorDave Greenberg <dave@civicrm.org>
Thu, 10 Sep 2015 23:06:23 +0000 (16:06 -0700)
committerDave Greenberg <dave@civicrm.org>
Thu, 10 Sep 2015 23:06:23 +0000 (16:06 -0700)
commitb59f68f08d7d428cb3622cfdf94b526c4d515928
tree3e29e0831ed74c800d755fcd03bf241e5e41c791
parent30c4c2c577c0c53b93173552b62564bea0c69b68
parent3e7119192759d4c0d3058b1db3f0c3b5ac0eacb9
Merge pull request #6412 from colemanw/CRM-11369

CRM-11369 - Changed to Pending (pay later) and Pending (incomplete transaction)
CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
templates/CRM/Event/Form/EventFees.tpl
tests/phpunit/WebTest/Event/AddEventTest.php
xml/templates/civicrm_data.tpl