Merge with develop and fix merge conflicts
This commit is contained in:
commit
72f4fedcbe
148 changed files with 20005 additions and 2718 deletions
|
|
@ -2,12 +2,17 @@
|
|||
|
||||
# windows specific
|
||||
pypiwin32
|
||||
|
||||
# general
|
||||
django > 1.10, < 2.0
|
||||
twisted >= 17.0.0
|
||||
mock >= 1.0.1
|
||||
django > 1.11, < 2.0
|
||||
twisted >= 18.0.0, < 19.0.0
|
||||
pillow == 2.9.0
|
||||
pytz
|
||||
future >= 0.15.2
|
||||
django-sekizai
|
||||
autobahn >= 17.9.3
|
||||
inflect
|
||||
|
||||
# testing
|
||||
mock >= 1.0.1
|
||||
anything
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue