Merge branch 'develop'

This commit is contained in:
Simon Vieille 2022-06-12 19:07:59 +02:00
commit c364cafd17
2 changed files with 3 additions and 0 deletions

View File

@ -2,6 +2,7 @@
### Added ### Added
* add a admin dashboard controller * add a admin dashboard controller
* add meta description in base.html.twig
### Fixed ### Fixed
### Changed ### Changed
* upgrade murph/murph-core * upgrade murph/murph-core

View File

@ -18,6 +18,8 @@
{%- endif -%} {%- endif -%}
{%- endblock -%} {%- endblock -%}
<meta name="description" content="{%- block pageDescription -%}{{- _page.metaDescription -}}{%- endblock -%}"/>
{%- block stylesheets -%} {%- block stylesheets -%}
{{ encore_entry_link_tags('app') }} {{ encore_entry_link_tags('app') }}
{%- endblock -%} {%- endblock -%}