<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
sievelib
chardet
argparse
djangorestframework>=3.11,<3.15
drf-spectacular
uritemplate
djangorestframework-simplejwt==5.2.2

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 refactoring

Conflicts:
	modoboa/admin/models.py
	modoboa/admin/templatetags/admin_extras.py
	modoboa/admin/views.py
	modoboa/core/app_settings.py
	modoboa/extensions/admin/forms.py
	modoboa/extensions/admin/tests.py
	modoboa/extensions/amavis/views.py
	modoboa/extensions/limits/tests.py
	modoboa/extensions/postfix_autoreply/models.py
	modoboa/extensions/sievefilters/views.py
	modoboa/extensions/webmail/fetch_parser.py
	modoboa/extensions/webmail/imaputils.py
	modoboa/extensions/webmail/lib.py
	modoboa/extensions/webmail/templatetags/webextras.py
	modoboa/extensions/webmail/views.py

<DFF> @@ -6,3 +6,5 @@ pycrypto
 sievelib
 chardet
 argparse
+rfc6266
+factory-boy

Merge branch 'master' into refactoring