Merge branch 'develop' into feature/allauth

# Conflicts:
#	requirements.txt
This commit is contained in:
vabene1111
2021-01-28 12:07:30 +01:00
31 changed files with 837 additions and 205 deletions

View File

@@ -1,4 +1,4 @@
bleach==3.2.2
bleach==3.2.3
bleach-whitelist==0.0.11
Django==3.1.5
django-annoying==0.10.6
@@ -30,5 +30,5 @@ django-random-queryset==0.1.3
Jinja2==2.11.2
django-webpack-loader==0.7.0
django-js-reverse==0.9.1
pre-commit==2.9.3
django-allauth==0.44.0
pre-commit==2.10.0
django-allauth==0.44.0