Merge branch 'master' of git://github.com/thelia/thelia into french_translation

Browse Source

* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email

...

This commit is contained in:

gmorel

2013-11-27 22:22:26 +01:00

parent ff18babbf9 b3a3cb2e8f

commit 94e2d7881d

47 changed files with 3069 additions and 201 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

templates/frontOffice/default/assets/img/email/header.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 73 KiB

BIN

templates/frontOffice/default/assets/img/email/logo.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB