Franck Allimant ca862b07e4 Merge branch 'master' into brands ...

Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql

2014-06-26 16:35:08 +02:00

..

Cheque

change license header

2014-04-18 09:36:41 +02:00

Colissimo

Update prices.json

2014-06-20 23:12:32 +02:00

Front

Added the COUPON_CLEAR_ALL event, and a route to trigger it.

2014-06-12 16:39:27 +02:00

Klikandpay @ a72c066e74

refactor customer and order ref

2014-04-22 09:59:23 +02:00

TheliaDebugBar

change license header

2014-04-18 09:36:41 +02:00

Tinymce

Added brands management

2014-06-26 10:52:13 +02:00

.gitkeep

set execution right // no more troubles

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