Merge pull request #6196 from eileenmcnaughton/master
authorcolemanw <coleman@civicrm.org>
Sat, 11 Jul 2015 16:49:28 +0000 (12:49 -0400)
committercolemanw <coleman@civicrm.org>
Sat, 11 Jul 2015 16:49:28 +0000 (12:49 -0400)
commit3ba0304fd74f29fb52c456d122c1de86fc9ff517
treecace6a4f70116a42affe845517ba53410d25f26e
parent1102c730beb93af35263b7fe6dcb38e3620458e4
parentf70eb51fc8cb6e52f4bb5898bc42ac47704c42a0
Merge pull request #6196 from eileenmcnaughton/master

remove redundant IF & rename contributionType to financialType