Franck Allimant f842f90e00 Merge branch 'master' into tinymce ...

Conflicts:
	local/modules/Tinymce/templates/backOffice/default/include/tinymce_init.tpl

2014-06-19 00:16:21 +02:00

..

Bundle

change license header

2014-04-18 09:36:41 +02:00

Controller

change license header

2014-04-18 09:36:41 +02:00

DependencyInjection

change license header

2014-04-18 09:36:41 +02:00

Event

php-cs pass

2014-06-17 00:43:10 +02:00

EventListener

various fixes from insight

2014-06-18 09:33:32 +02:00

Form/Type

change license header

2014-04-18 09:36:41 +02:00

HttpFoundation

change license header

2014-04-18 09:36:41 +02:00

HttpKernel

change license header

2014-04-18 09:36:41 +02:00

Routing

change license header

2014-04-18 09:36:41 +02:00

Security

create resource and page for export

2014-04-24 17:55:09 +02:00

Template

various fixes from insight

2014-06-18 09:33:32 +02:00

Translation

various fixes from insight

2014-06-18 09:33:32 +02:00

Application.php

change license header

2014-04-18 09:36:41 +02:00

Thelia.php

Merge branch 'master' into tinymce

2014-06-19 00:16:21 +02:00

TheliaContainerBuilder.php

change license header

2014-04-18 09:36:41 +02:00

TheliaHttpKernel.php

various fixes from insight

2014-06-18 09:33:32 +02:00

TheliaKernelEvents.php

Fix cs

2014-06-04 13:43:03 +02:00