Merge with dev

This commit is contained in:
Степаненко Ольга 2021-05-29 17:20:35 +03:00
parent e4da328cb6
commit 2037791ce8

View File

@ -9,7 +9,8 @@
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css"
integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous"> integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous">
<link rel="icon" href="static/main/favs/favicon.ico" type="image/x-icon"> <link rel="icon" href="{% static 'main/favs/favicon.ico'%}" type="image/x-icon">
<style> <style>
.bd-placeholder-img { .bd-placeholder-img {