Weird error
Merge branch 'master' into stephane
Merge remote-tracking branch 'origin/master' into stephane
Temp discount
resolve the problem of import in hel view. Images are correctly loaded.
Changements de panier
Merge branch 'stephane'
Discount Update
commit test