murph/murph-core
murph/murph-core
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases 22 Wiki Activity

Merge branch 'feature/updates' into develop

Browse source
This commit is contained in:
Simon Vieille 2023-01-08 20:54:16 +01:00
parent 6b222dd4f7 e402c49835
commit 03afb6fb4b
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composer.json
View file

@ -37,7 +37,7 @@
"symfony/event-dispatcher": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony/finder": "5.4.*",
"symfony/flex": "^1.3.1",
"symfony/flex": "^2.2",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
@ -60,7 +60,8 @@
"symfony/webpack-encore-bundle": "^1.11",
"symfony/yaml": "5.4.*",
"twig/extra-bundle": "^2.12|^3.3",
"twig/twig": "^2.12|^3.3"
"twig/twig": "^2.12|^3.3",
"symfony/runtime": "^5.4"
},
"autoload": {
"psr-4": {

6
src/core/Resources/views/admin/module/metas.html.twig
View file

@ -1,4 +1,6 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{{ asset(site_logo) }}">
<link rel="icon" href="{{ asset(site_logo) }}">
{% if site_logo is defined %}
<link rel="shortcut icon" href="{{ asset(site_logo) }}">
<link rel="icon" href="{{ asset(site_logo) }}">
{% endif %}