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

..

cache

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

config

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

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

media

Merge branch 'master' into loops

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

modules

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

session

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00