Merge branch 'feature/updates' into develop
This commit is contained in:
commit
03afb6fb4b
|
@ -37,7 +37,7 @@
|
||||||
"symfony/event-dispatcher": "5.4.*",
|
"symfony/event-dispatcher": "5.4.*",
|
||||||
"symfony/expression-language": "5.4.*",
|
"symfony/expression-language": "5.4.*",
|
||||||
"symfony/finder": "5.4.*",
|
"symfony/finder": "5.4.*",
|
||||||
"symfony/flex": "^1.3.1",
|
"symfony/flex": "^2.2",
|
||||||
"symfony/form": "5.4.*",
|
"symfony/form": "5.4.*",
|
||||||
"symfony/framework-bundle": "5.4.*",
|
"symfony/framework-bundle": "5.4.*",
|
||||||
"symfony/http-client": "5.4.*",
|
"symfony/http-client": "5.4.*",
|
||||||
|
@ -60,7 +60,8 @@
|
||||||
"symfony/webpack-encore-bundle": "^1.11",
|
"symfony/webpack-encore-bundle": "^1.11",
|
||||||
"symfony/yaml": "5.4.*",
|
"symfony/yaml": "5.4.*",
|
||||||
"twig/extra-bundle": "^2.12|^3.3",
|
"twig/extra-bundle": "^2.12|^3.3",
|
||||||
"twig/twig": "^2.12|^3.3"
|
"twig/twig": "^2.12|^3.3",
|
||||||
|
"symfony/runtime": "^5.4"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<link rel="shortcut icon" href="{{ asset(site_logo) }}">
|
{% if site_logo is defined %}
|
||||||
<link rel="icon" href="{{ asset(site_logo) }}">
|
<link rel="shortcut icon" href="{{ asset(site_logo) }}">
|
||||||
|
<link rel="icon" href="{{ asset(site_logo) }}">
|
||||||
|
{% endif %}
|
||||||
|
|
Loading…
Reference in a new issue