From ae1a05eb852871b1c0589efeae5f93c756fe6788 Mon Sep 17 00:00:00 2001 From: gmorel Date: Sun, 29 Dec 2013 04:28:11 +0100 Subject: [PATCH] Merge --- .gitmodules | 0 .../Controller/Admin/AbstractSeoCrudController.php | 0 .../Thelia/Core/Event/UpdateFilePositionEvent.php | 0 core/lib/Thelia/Core/Event/UpdateSeoEvent.php | 0 core/lib/Thelia/Form/SeoFieldsTrait.php | 0 core/lib/Thelia/Form/SeoForm.php | 0 .../Controller/Admin/TheliaDebguBarController.php | 0 .../backOffice/default/assets/img/db-loader.gif | Bin .../templates/backOffice/default/tdb-index.html | 0 templates/backOffice/default/includes/seo-tab.html | 0 .../default/assets/less/thelia/folder.less | 0 templates/frontOffice/default/folder.html | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitmodules mode change 100644 => 100755 core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php mode change 100644 => 100755 core/lib/Thelia/Core/Event/UpdateFilePositionEvent.php mode change 100644 => 100755 core/lib/Thelia/Core/Event/UpdateSeoEvent.php mode change 100644 => 100755 core/lib/Thelia/Form/SeoFieldsTrait.php mode change 100644 => 100755 core/lib/Thelia/Form/SeoForm.php mode change 100644 => 100755 local/modules/TheliaDebugBar/Controller/Admin/TheliaDebguBarController.php mode change 100644 => 100755 local/modules/TheliaDebugBar/templates/backOffice/default/assets/img/db-loader.gif mode change 100644 => 100755 local/modules/TheliaDebugBar/templates/backOffice/default/tdb-index.html mode change 100644 => 100755 templates/backOffice/default/includes/seo-tab.html mode change 100644 => 100755 templates/frontOffice/default/assets/less/thelia/folder.less mode change 100644 => 100755 templates/frontOffice/default/folder.html diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php b/core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Event/UpdateFilePositionEvent.php b/core/lib/Thelia/Core/Event/UpdateFilePositionEvent.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Core/Event/UpdateSeoEvent.php b/core/lib/Thelia/Core/Event/UpdateSeoEvent.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Form/SeoFieldsTrait.php b/core/lib/Thelia/Form/SeoFieldsTrait.php old mode 100644 new mode 100755 diff --git a/core/lib/Thelia/Form/SeoForm.php b/core/lib/Thelia/Form/SeoForm.php old mode 100644 new mode 100755 diff --git a/local/modules/TheliaDebugBar/Controller/Admin/TheliaDebguBarController.php b/local/modules/TheliaDebugBar/Controller/Admin/TheliaDebguBarController.php old mode 100644 new mode 100755 diff --git a/local/modules/TheliaDebugBar/templates/backOffice/default/assets/img/db-loader.gif b/local/modules/TheliaDebugBar/templates/backOffice/default/assets/img/db-loader.gif old mode 100644 new mode 100755 diff --git a/local/modules/TheliaDebugBar/templates/backOffice/default/tdb-index.html b/local/modules/TheliaDebugBar/templates/backOffice/default/tdb-index.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/seo-tab.html b/templates/backOffice/default/includes/seo-tab.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/folder.less b/templates/frontOffice/default/assets/less/thelia/folder.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/folder.html b/templates/frontOffice/default/folder.html old mode 100644 new mode 100755