shaman/workshop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Решены конфликты при слиянии main

Browse source
This commit is contained in:
shaman_lesnoy 2025-01-12 07:17:22 +03:00
commit 2c2e2a2f5b
7 changed files with 76 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/main.html
View file

@ -6,7 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>workshop</title>
<link rel="stylesheet" href="{{ url_for('static', filename='main.css') }}">
<<<<<<< HEAD
<link rel="icon" href="https://csgoworkshop.ru/favicon.ico" type="image/x-icon">
=======
<link rel="icon" href="{{ url_for('static', filename='assets/steam-120.ico') }}" type="image/x-icon">
>>>>>>> 9cc0929a09596abeb93ee7f2711527fb5da25f7a
</head>