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

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-07-18 15:56:47 +02:00
commit 862d2a5d06
9 changed files with 228 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

2
requirements.txt
View file

@ -3,7 +3,7 @@
# general
attrs >= 19.2.0
django >= 2.2.5, < 2.3
twisted >= 19.2.1, < 20.0.0
twisted >= 20.3.0, < 21.0.0
pytz
djangorestframework >= 3.10.3, < 3.12
django-filter >= 2.2.0, < 2.3