gRoussac 3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop ...

Conflicts:
	modules/mailalerts/mailalerts.php

2013-09-12 10:09:25 +02:00

..

controllers

[*] MO : MailAlerts : multishop/multilang full compatibility

2013-09-10 10:24:40 +02:00

img

// Welcome 2013

2013-01-04 11:19:03 +01:00

mails

[+] MO : Mailalerts - Add Total tax paid to order confirmation

2013-08-29 17:13:48 +02:00

translations

[-] Core: delete lang files

2013-03-21 14:15:55 +01:00

upgrade

[*] MO : MailAlerts : Add SQL update script for v2.5

2013-09-10 11:01:11 +02:00

views

//replace some escape:'html' by addslashes in .tpl with javascript

2013-06-28 11:06:08 +02:00

config.xml

// Config files were translated in french

2013-08-20 17:49:05 +02:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

logo.gif

…

logo.png

…

MailAlert.php

[*] MO : MailAlerts : multishop/multilang full compatibility

2013-09-10 10:24:40 +02:00

mailalerts-account.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

mailalerts-ajax.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

mailalerts-extra.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

mailalerts.css

…

mailalerts.php

Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop

2013-09-12 10:09:25 +02:00