Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop' ...

[#2069] unread_conversation_count

See merge request pleroma/pleroma!2939

2020-10-29 23:39:15 +00:00

..

controllers

Merge branch 'issue/2069' into 'develop'

2020-10-29 23:39:15 +00:00

views

JPEG content_type must be image/jpeg

2020-10-13 10:37:24 -05:00