Resolve merge conflicts
This commit is contained in:
commit
9cdc37355c
25 changed files with 726 additions and 444 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# general
|
||||
attrs >= 19.2.0
|
||||
django >= 2.2.5, < 2.3
|
||||
django >= 2.2.5, < 3.0
|
||||
twisted >= 20.3.0, < 21.0.0
|
||||
pytz
|
||||
djangorestframework >= 3.10.3, < 3.12
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue