Merge branch 'master' into Develop

# Conflicts:
#	requirements.txt
This commit is contained in:
Ozzie Isaacs 2023-03-05 16:06:49 +01:00
commit fa95b07a95

View File

@ -7,7 +7,7 @@ Flask-Principal>=0.3.2,<0.5.1
backports_abc>=0.4 backports_abc>=0.4
Flask>=1.0.2,<2.3.0 Flask>=1.0.2,<2.3.0
iso-639>=0.4.5,<0.5.0 iso-639>=0.4.5,<0.5.0
PyPDF<3.6.0 PyPDF>=3.0.0,<3.6.0
pytz>=2016.10 pytz>=2016.10
requests>=2.11.1,<2.29.0 requests>=2.11.1,<2.29.0
SQLAlchemy>=1.3.0,<2.0.0 SQLAlchemy>=1.3.0,<2.0.0