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 2021-09-06 21:52:17 +02:00
commit b855f4fb20
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
requirements.txt
View file

@ -3,7 +3,7 @@
# general # general
attrs >= 19.2.0 attrs >= 19.2.0
django >= 3.2, < 3.3 django >= 3.2, < 3.3
twisted >= 20.3.0, < 22.0.0 twisted >= 21.7.0, < 22.0.0
pytz pytz
djangorestframework >= 3.10.3, < 3.12 djangorestframework >= 3.10.3, < 3.12
pyyaml pyyaml