Merge branch 'master' into _31_interface_creation_parcours

Browse Source

...

This commit is contained in:

Mathieu Jaumotte

2021-05-06 10:55:22 +02:00

parent b8e6e98a74 2db847ada2

commit 088e522292

40 changed files with 164 additions and 396 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

0

src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig → src/Bundle/ChillMainBundle/Resources/test/views/base.html.twig

0

src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/fakeTemplate.html.twig → src/Bundle/ChillMainBundle/Resources/test/views/menus/fakeTemplate.html.twig

0

src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/normalMenu.html.twig → src/Bundle/ChillMainBundle/Resources/test/views/menus/normalMenu.html.twig

0

src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/overrideTemplate.html.twig → src/Bundle/ChillMainBundle/Resources/test/views/menus/overrideTemplate.html.twig