Merge branch 'master' into tax

This commit is contained in:
Etienne Roudeix
2013-10-21 19:12:07 +02:00
10 changed files with 399 additions and 2 deletions

View File

@@ -28,7 +28,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
('thelia_customer_remember_me_cookie_name', 'tcrmcn', 0, 0, NOW(), NOW()),
('thelia_customer_remember_me_cookie_expiration', 31536000, 0, 0, NOW(), NOW()),
('session_config.handlers', 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler', 0, 0, NOW(), NOW()),
('company_name','', 0, 0, NOW(), NOW())
('company_name','', 0, 0, NOW(), NOW()),
('contact_email','', 0, 0, NOW(), NOW())
;
@@ -1288,4 +1289,4 @@ INSERT INTO resource (`id`, `code`, `created_at`, `updated_at`) VALUES
(NULL, 'admin.configuration.template.view', NOW(), NOW()),
(NULL, 'admin.configuration.template.create', NOW(), NOW()),
(NULL, 'admin.configuration.template.update', NOW(), NOW()),
(NULL, 'admin.configuration.template.delete', NOW(), NOW());
(NULL, 'admin.configuration.template.delete', NOW(), NOW());