gmorel 71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon ...

# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml

2013-08-28 18:19:38 +02:00

..

BaseAction.php

Removed InternalEvent, simplified SecurityContext

2013-08-28 17:52:32 +02:00

Cart.php

/bin/bash: q : commande introuvable

2013-08-14 16:24:22 +02:00

Category.php

Removed InternalEvent, simplified SecurityContext

2013-08-28 17:52:32 +02:00

Coupon.php

WIP

2013-08-28 14:37:29 +02:00

Customer.php

Removed InternalEvent, simplified SecurityContext

2013-08-28 17:52:32 +02:00

Image.php

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00