diff options
| author |  Gareth Coles <[email protected]> | 2019-10-06 21:48:54 +0100 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2019-10-06 21:48:54 +0100 |
| commit | 18f4c2912e86461a68125b3aaebeed7b10acc3f6 (patch) | |
| tree | eec9f9098ed25ac5019dfc231922eabd096934d8 /Pipfile | |
| parent | Remove GH login implementation, out of scope of this PR (diff) | |
| parent | disable usage of pyuwsgi on windows due to incompatibility, library is only u... (diff) | |
Merge branch 'master' into #201-django-allauth
# Conflicts:
# Pipfile
# Pipfile.lock
Diffstat (limited to 'Pipfile')
| -rw-r--r-- | Pipfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ pygments = "~=2.3.1" #wiki = {git = "https://github.com/python-discord/django-wiki.git"} wiki = {path = "./docker/wheels/wiki-0.5.dev20190420204942-py3-none-any.whl"} pyyaml = "~=5.1" -pyuwsgi = "~=2.0" +pyuwsgi = {version = "~=2.0", sys_platform = "!='win32'"} django-allauth = "~=0.40" [dev-packages] |