Merge branch '1299-encoding-problem-in-rss-feeds' into 'develop'
Resolve "Encoding problem in RSS feeds?" Closes #1299 See merge request funkwhale/funkwhale!1269
This commit is contained in:
commit
38f0fd3b60
|
@ -49,7 +49,7 @@ cryptography~=2.9.0
|
||||||
# clone until the branch is merged and released upstream
|
# clone until the branch is merged and released upstream
|
||||||
git+https://github.com/agateblue/requests-http-signature.git@signature-header-support
|
git+https://github.com/agateblue/requests-http-signature.git@signature-header-support
|
||||||
django-cleanup~=5.0.0
|
django-cleanup~=5.0.0
|
||||||
requests~=2.24.0
|
requests~=2.25.1
|
||||||
pyOpenSSL~=19.1.0
|
pyOpenSSL~=19.1.0
|
||||||
|
|
||||||
# for LDAP authentication
|
# for LDAP authentication
|
||||||
|
@ -58,7 +58,7 @@ django-auth-ldap~=2.2.0
|
||||||
|
|
||||||
pydub~=0.24.0
|
pydub~=0.24.0
|
||||||
pyld~=1.0.0
|
pyld~=1.0.0
|
||||||
aiohttp~=3.6.0
|
aiohttp~=3.7.4
|
||||||
|
|
||||||
django-oauth-toolkit~=1.3.0
|
django-oauth-toolkit~=1.3.0
|
||||||
django-storages~=1.9.0
|
django-storages~=1.9.0
|
||||||
|
|
|
@ -14,7 +14,7 @@ black==19.10b0
|
||||||
#profiling
|
#profiling
|
||||||
|
|
||||||
asynctest~=0.12.0
|
asynctest~=0.12.0
|
||||||
aioresponses~=0.6.0
|
aioresponses~=0.7.2
|
||||||
#line_profiler<3
|
#line_profiler<3
|
||||||
#https://github.com/dmclain/django-debug-toolbar-line-profiler/archive/master.zip
|
#https://github.com/dmclain/django-debug-toolbar-line-profiler/archive/master.zip
|
||||||
#django-silk
|
#django-silk
|
||||||
|
|
Loading…
Reference in New Issue