Franck Allimant f842f90e00 Merge branch 'master' into tinymce ...

Conflicts:
	local/modules/Tinymce/templates/backOffice/default/include/tinymce_init.tpl

2014-06-19 00:16:21 +02:00

..

Cheque

change license header

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

Colissimo

Correction issue #425

2014-05-22 11:06:43 +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

Polished tinyMCE integration

2014-06-18 20:26:04 +02:00

.gitkeep

set execution right // no more troubles

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