Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
Griatch 2019-01-01 15:19:20 +01:00
commit 981119b640
89 changed files with 5435 additions and 818 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win_requirements.txt
View file

@ -6,7 +6,7 @@ pypiwin32
# general
django > 1.11, < 2.0
twisted >= 18.0.0, < 19.0.0
pillow == 2.9.0
pillow == 5.2.0
pytz
future >= 0.15.2
django-sekizai