Skip to main content Skip to search

Commit e0c7da920d51a55853a052bba1f04ac675315c80

Author date: November 13, 2012 8:20

November 13, 2012 8:20

Commit e0c7da9 on 7.x-4.x

by gordon

Custom text: ecommerce: /ec_charge/ec_charge.admin.inc

+++++--

7 additions & 2 deletions

Custom text: ecommerce: /ec_charge/ec_charge.checkout.inc

++++---

6 additions & 4 deletions

Custom text: ecommerce: /ec_charge/ec_charge.module

+++---

6 additions & 6 deletions

Custom text: ecommerce: /ec_charge/modules/ec_charge.inc

+++++++

78 additions & 0 deletions

Custom text: ecommerce: /ec_customer/ec_customer.checkout.inc

++++---

30 additions & 28 deletions

Custom text: ecommerce: /ec_product/ec_product.charge.inc

+-

1 addition & 1 deletion
```
Merge branch '6.x-4.x' of git.drupal.org:project/ecommerce into 7.x-4.x

Conflicts:
ec_charge/ec_charge.admin.inc
ec_charge/ec_charge.checkout.inc
ec_charge/ec_charge.module
ec_customer/ec_customer.checkout.inc
```