Merge @dadosch's changes & fix dependency conflicts

This commit is contained in:
Daniel Quinn
2018-09-02 21:06:40 +01:00
14 changed files with 33 additions and 30 deletions

View File

@@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"
[packages]
django = "<2.0,>=1.11"
django = "<2.1,>=2.0"
pillow = "*"
coveralls = "*"
dateparser = "*"