Merge branch 'patch-1' into 'master'

limit django, django-celery-beat to compatible versions

See merge request allianceauth/allianceauth!1104
This commit is contained in:
Basraah 2018-11-11 08:06:39 +00:00
commit 0aa66c5729

View File

@ -16,12 +16,12 @@ install_requires = [
'celery>=4.0.2', 'celery>=4.0.2',
'celery_once', 'celery_once',
'django>=1.11,<2.1', 'django>=1.11,<=2.0.8',
'django-bootstrap-form', 'django-bootstrap-form',
'django-registration==2.4', 'django-registration==2.4',
'django-sortedm2m', 'django-sortedm2m',
'django-redis-cache>=1.7.1', 'django-redis-cache>=1.7.1',
'django-celery-beat', 'django-celery-beat<=1.1.1',
'openfire-restapi', 'openfire-restapi',
'sleekxmpp', 'sleekxmpp',