Merge branch 'main' into 2965_export_readthrough

This commit is contained in:
Hugh Rundle 2024-01-12 16:12:01 +11:00 committed by GitHub
commit 5d13bf8e49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View file

@ -10,9 +10,7 @@
{% elif notification.notification_type == 'FOLLOW' %}
{% include 'notifications/items/follow.html' %}
{% elif notification.notification_type == 'FOLLOW_REQUEST' %}
{% if notification.related_users.0.is_active %}
{% include 'notifications/items/follow_request.html' %}
{% endif %}
{% include 'notifications/items/follow_request.html' %}
{% elif notification.notification_type == 'IMPORT' %}
{% include 'notifications/items/import.html' %}
{% elif notification.notification_type == 'USER_IMPORT' %}

View file

@ -16,7 +16,7 @@ libsass==0.22.0
Markdown==3.4.1
Pillow==10.0.1
psycopg2==2.9.5
pycryptodome==3.16.0
pycryptodome==3.19.1
python-dateutil==2.8.2
redis==4.5.4
requests==2.31.0