<NME> requirements.txt
<BEF> django<4.0
django-ckeditor==6.3.0
django-phonenumber-field[phonenumbers]==7.0.0
django-reversion==5.0.3
django-xforwardedfor-middleware==2.0
django-otp==1.1.3
django-filter

dj-database-url
rfc6266
factory-boy<2.4
passlib

passlib~=1.7.4
bcrypt  # Requires libffi-dev and python-dev

asgiref
dnspython==2.2.1
feedparser==6.0.10
greenlet==1.1.3.post0
gevent==22.10.1
jsonfield==3.1.0
Pillow  # Optional dependency for django-ckeditor
progressbar33==2.4
py-dateutil==2.2
cryptography
pytz
requests
lxml
chardet
ovh
oath
redis
rrdtool>=0.1.10
qrcode

aiosmtplib
aioredis==2.0.1

<MSG> Merge branch 'master' into feature/radicale

Conflicts:
	modoboa/extensions/amavis/app_settings.py
	tests/install_from_scratch.py

<DFF> @@ -10,3 +10,5 @@ argparse
 rfc6266
 factory-boy<2.4
 passlib
+-e git+https://github.com/tonioo/django-versionfield.git#egg=django-versionfield
+requests

Merge branch 'master' into feature/radicale