From a801f9bfb814d57385ab673b8bf6d47812d92c28 Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 28 Nov 2013 22:32:39 +0100 Subject: [PATCH] Merge --- templates/email/default/README | 0 templates/email/default/default-html-layout.tpl | 0 templates/email/default/default-text-layout.tpl | 0 templates/email/default/order_confirmation.html | 0 templates/email/default/order_confirmation.txt | 0 .../frontOffice/default/assets/img/email/header.jpg | Bin .../frontOffice/default/assets/img/email/logo.gif | Bin templates/frontOffice/default/email/order.html | 0 .../frontOffice/default/email/password-reset.html | 0 templates/frontOffice/default/email/password.html | 0 templates/frontOffice/default/email/register.html | 0 templates/frontOffice/default/email/template.tpl | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 templates/email/default/README mode change 100644 => 100755 templates/email/default/default-html-layout.tpl mode change 100644 => 100755 templates/email/default/default-text-layout.tpl mode change 100644 => 100755 templates/email/default/order_confirmation.html mode change 100644 => 100755 templates/email/default/order_confirmation.txt mode change 100644 => 100755 templates/frontOffice/default/assets/img/email/header.jpg mode change 100644 => 100755 templates/frontOffice/default/assets/img/email/logo.gif mode change 100644 => 100755 templates/frontOffice/default/email/order.html mode change 100644 => 100755 templates/frontOffice/default/email/password-reset.html mode change 100644 => 100755 templates/frontOffice/default/email/password.html mode change 100644 => 100755 templates/frontOffice/default/email/register.html mode change 100644 => 100755 templates/frontOffice/default/email/template.tpl diff --git a/templates/email/default/README b/templates/email/default/README old mode 100644 new mode 100755 diff --git a/templates/email/default/default-html-layout.tpl b/templates/email/default/default-html-layout.tpl old mode 100644 new mode 100755 diff --git a/templates/email/default/default-text-layout.tpl b/templates/email/default/default-text-layout.tpl old mode 100644 new mode 100755 diff --git a/templates/email/default/order_confirmation.html b/templates/email/default/order_confirmation.html old mode 100644 new mode 100755 diff --git a/templates/email/default/order_confirmation.txt b/templates/email/default/order_confirmation.txt old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/email/header.jpg b/templates/frontOffice/default/assets/img/email/header.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/email/logo.gif b/templates/frontOffice/default/assets/img/email/logo.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/order.html b/templates/frontOffice/default/email/order.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/password-reset.html b/templates/frontOffice/default/email/password-reset.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/password.html b/templates/frontOffice/default/email/password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/register.html b/templates/frontOffice/default/email/register.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/template.tpl b/templates/frontOffice/default/email/template.tpl old mode 100644 new mode 100755