Etienne Roudeix 6a64f827ce fix conflicts

2014-01-06 12:14:56 +01:00

..

Action

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Cart

refactor cart events

2013-09-30 10:15:22 +02:00

Command

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Condition

Coupon : Condition module cleaning

2014-01-05 01:14:41 +01:00

Config

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Controller

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Core

fix conflicts

2014-01-06 12:14:56 +01:00

Coupon

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Exception

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 21:37:26 +01:00

Form

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Install

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Log

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Mailer

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00

Model

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Module

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Rewriting

fix urls in loops

2013-12-10 15:48:22 +01:00

TaxEngine

refacto getTaxCountry which is actually getDeliveryCountry

2013-12-20 11:13:08 +01:00

Tests

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Tools

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Type

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00