Merge remote-tracking branch 'origin/develop' into HomeAssistantConnector

# Conflicts:
#	cookbook/forms.py
#	requirements.txt
This commit is contained in:
Mikhail Epifanov
2024-02-20 09:18:19 +01:00
41 changed files with 994 additions and 4156 deletions

View File

@@ -4,7 +4,7 @@
{% load i18n %}
{% load l10n %}
{% block title %}{% trans 'Search' %}{% endblock %}
{% block title %}{% trans 'Space Management' %}{% endblock %}
{% block content %}