Browse Source

Merge branch 'develop'

master
Simon Vieille 2 weeks ago
parent
commit
c364cafd17
  1. 1
      CHANGELOG.md
  2. 2
      templates/base.html.twig

1
CHANGELOG.md

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

2
templates/base.html.twig

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

Loading…
Cancel
Save